Fix equals

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@3670 1c488680-804c-0410-94cd-c6b725194a0e
weld · Sep 15, 2009 · 89f0640 · 89f0640
1 parent b91932f
commit 89f0640
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 34 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java b/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java
@@ -65,7 +65,7 @@ public AbstractClassBean<?> getDeclaringBean()
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
    @Override

diff --git a/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELContext.java b/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELContext.java
@@ -55,7 +55,7 @@ public VariableMapper getVariableMapper()
    @Override
    public boolean equals(Object obj)
    {
-      return delgate().equals(obj);
+      return this == obj || delgate().equals(obj);
    }
 
    @SuppressWarnings("unchecked")

diff --git a/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java b/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java
@@ -66,7 +66,7 @@ public void setValue(ELContext context, Object base, Object property, Object val
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
    @Override

diff --git a/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java b/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java
@@ -58,7 +58,7 @@ public ValueExpression createValueExpression(ELContext context, String expressio
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
    @Override

diff --git a/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingMethodExpression.java b/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingMethodExpression.java
@@ -55,11 +55,10 @@ public boolean isLiteralText()
       return delegate().isLiteralText();
    }
 
-
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
    @Override

diff --git a/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingValueExpression.java b/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingValueExpression.java
@@ -77,7 +77,7 @@ public boolean isLiteralText()
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
    @Override

diff --git a/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java b/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java
@@ -63,7 +63,7 @@ public int hashCode()
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj  ||delegate().equals(obj);
    }
 
    public Bootstrap deployBeans()

diff --git a/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java b/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java
@@ -105,7 +105,7 @@ public int hashCode()
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
 }
diff --git a/...c/main/java/org/jboss/webbeans/bootstrap/spi/helpers/ForwardingBeanDeploymentArchive.java b/...c/main/java/org/jboss/webbeans/bootstrap/spi/helpers/ForwardingBeanDeploymentArchive.java
@@ -60,7 +60,7 @@ public int hashCode()
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
    @Override

diff --git a/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java b/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java
@@ -47,7 +47,7 @@ public int hashCode()
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
 }
diff --git a/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java b/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java
@@ -65,7 +65,7 @@ public boolean isStateless()
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
    @Override

diff --git a/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java b/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java
@@ -43,7 +43,7 @@ public SessionObjectReference resolveEjb(EjbDescriptor<?> ejbDescriptor)
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
    @Override

diff --git a/...rc/main/java/org/jboss/webbeans/injection/spi/helpers/ForwardingJpaInjectionServices.java b/...rc/main/java/org/jboss/webbeans/injection/spi/helpers/ForwardingJpaInjectionServices.java
@@ -62,7 +62,7 @@ public int hashCode()
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
 }
diff --git a/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceLoader.java b/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceLoader.java
@@ -38,7 +38,7 @@ public Collection<URL> getResources(String name)
    @Override
    public boolean equals(Object obj)
    {
-      return delegate().equals(obj);
+      return this == obj || delegate().equals(obj);
    }
 
    @Override

diff --git a/tests/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java b/tests/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java
@@ -178,24 +178,24 @@ public String toString()
       return builder.toString(); 
    }
 
-   @Override
-   public boolean equals(Object other)
-   {
-      if (other instanceof EjbDescriptor)
-      {
-         EjbDescriptor<T> that = (EjbDescriptor<T>) other;
-         return this.getBeanClass().equals(that.getBeanClass());
-      }
-      else
-      {
-         return false;
-      }
-   }
-
-   @Override
-   public int hashCode()
-   {
-      return getEjbName().hashCode();
-   }
+//   @Override
+//   public boolean equals(Object other)
+//   {
+//      if (other instanceof EjbDescriptor)
+//      {
+//         EjbDescriptor<T> that = (EjbDescriptor<T>) other;
+//         return this.getBeanClass().equals(that.getBeanClass());
+//      }
+//      else
+//      {
+//         return false;
+//      }
+//   }
+//   
+//   @Override
+//   public int hashCode()
+//   {
+//      return getEjbName().hashCode();
+//   }
 
 }