You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ar...@apache.org on 2012/11/24 23:10:21 UTC
svn commit: r1413276 - in /openwebbeans/branches/owb_1.1.x/webbeans-impl/src: main/java/org/apache/webbeans/component/ test/java/org/apache/webbeans/newtests/producer/

Author: arne
Date: Sat Nov 24 22:10:20 2012
New Revision: 1413276

URL: http://svn.apache.org/viewvc?rev=1413276&view=rev
Log:
OWB-724: Merged from trunk

Added:
    openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/AmbigousProducerTest.java
      - copied unchanged from r1412510, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/AmbigousProducerTest.java
    openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/ProducerBean2.java
      - copied unchanged from r1412510, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/ProducerBean2.java
Modified:
    openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
    openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/ProducerBean.java

Modified: openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java?rev=1413276&r1=1413275&r2=1413276&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java (original)
+++ openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java Sat Nov 24 22:10:20 2012
@@ -165,4 +165,20 @@ public abstract class AbstractProducerBe
         // the injection points of producers are the parameters of the producermethod.
         // since CDI-1.1 we must not check those for is serializable anymore.
     }
+
+    @Override
+    public int hashCode()
+    {
+        return super.hashCode() ^ ownerComponent.hashCode();
+    }
+
+    public boolean equals(Object object)
+    {
+        if (!super.equals(object))
+        {
+            return false;
+        }
+        AbstractProducerBean<?> other = (AbstractProducerBean<?>) object;
+        return ownerComponent.equals(other.ownerComponent);
+    }
 }

Modified: openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/ProducerBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/ProducerBean.java?rev=1413276&r1=1413275&r2=1413276&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/ProducerBean.java (original)
+++ openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/ProducerBean.java Sat Nov 24 22:10:20 2012
@@ -49,7 +49,7 @@ public class ProducerBean {
 
     @Produces
     @Named("name5")
-    public String getName6() {
+    public String getName5() {
         return "name5";
     }