[jboss-cvs] JBossAS SVN: r74891 - projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-06-22 07:12:36 -0400 (Sun, 22 Jun 2008)
New Revision: 74891

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java
Log:
Fix delegate handler equals.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java	2008-06-22 10:50:27 UTC (rev 74890)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java	2008-06-22 11:12:36 UTC (rev 74891)
@@ -30,6 +30,7 @@
 import java.net.URL;
 import java.util.List;
 
+import org.jboss.util.JBossObject;
 import org.jboss.virtual.spi.VFSContext;
 import org.jboss.virtual.spi.VirtualFileHandler;
 
@@ -173,18 +174,17 @@
    {
       if (o == this)
          return true;
-      
-      if (o instanceof DelegatingHandler)
+
+      if (o instanceof VirtualFileHandler == false)
+         return false;
+
+      VirtualFileHandler vfh = (VirtualFileHandler)o;
+      if (vfh instanceof DelegatingHandler)
       {
          DelegatingHandler handler = (DelegatingHandler) o;
-         if (delegate != null)
-            return delegate.equals(handler.delegate);
-         else if (handler.delegate != null)
-            return false;   // one is null
-         else
-            return true;    // both are null
+         vfh = handler.getDelegate();
       }
 
-      return false;
+      return JBossObject.equals(delegate, vfh);
    }
 }