Issue number: 633 - ShaderAttributeSetRetained : remove(..) doesn't remove a ShaderAttribute

Submitted by:  interactivemesh
Reviewed by:   aces


git-svn-id: https://svn.java.net/svn/j3d-core~svn/branches/dev-1_6@946 ba19aa83-45c5-6ac9-afd3-db810772062c

1 files changed, 3 insertions, 3 deletions

diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java
index 9679d33..e586942 100644
--- a/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java
+++ b/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java
@@ -31,11 +31,11 @@
 
 package javax.media.j3d;
 
-import java.util.Iterator;
+
 import java.util.Map;
 import java.util.HashMap;
 import java.util.ArrayList;
-import javax.vecmath.*;
+
 
 /**
  * The ShaderAttributeSet object provides uniform attributes to shader
@@ -135,7 +135,7 @@ class ShaderAttributeSetRetained extends NodeComponentRetained {
     void remove(ShaderAttribute attr) {
 	synchronized(liveStateLock) {   
 	    String attrName = attr.getAttributeName();
-	    if (attrs.get(attrName) == attr) {
+	    if (attrs.get(attrName) == attr.retained) {
 		attrs.remove(attrName);
 		if (source.isLive()) {
 		    ((ShaderAttributeRetained)attr.retained).clearLive(refCount);