svn commit: r1050306 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/event/NotificationManager.java test/java/org/apache/webbeans/newtests/portable/events/extensions/AddObserverMethodExtension.java

[djencks]

Author: djencks
Date: Fri Dec 17 08:06:46 2010
New Revision: 1050306

URL: http://svn.apache.org/viewvc?rev=1050306&view=rev
Log:
OWB-490, CDITCK-174, CDITCK-199 re-revert rev 1034955 to comply with cdi tck 
1.0.4-SNAPSHOT

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/extensions/AddObserverMethodExtension.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=1050306&r1=1050305&r2=1050306&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
 Fri Dec 17 08:06:46 2010
@@ -354,7 +354,13 @@ public final class NotificationManager
         {
             Type beanClassArg = actualArgs[0];
             Type returnClassArg = actualArgs[1];
-                        
+            
+            if(isObserverMethod)
+            {
+                beanClassArg = actualArgs[1];
+                returnClassArg = actualArgs[0];
+            }
+            
             if(checkEventTypeParameterForExtensions(beanClass, beanClassArg) 
&& 
                     
checkEventTypeParameterForExtensions(producerOrObserverReturnClass, 
returnClassArg))
             {

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/extensions/AddObserverMethodExtension.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/extensions/AddObserverMethodExtension.java?rev=1050306&r1=1050305&r2=1050306&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/extensions/AddObserverMethodExtension.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/extensions/AddObserverMethodExtension.java
 Fri Dec 17 08:06:46 2010
@@ -40,9 +40,9 @@ public class AddObserverMethodExtension 
     
     public static class MyBeanExtension implements Extension
     {
-        public static ObserverMethod<AddObserverMethodExtension> 
observerMethod;
+        public static ObserverMethod<MyEvent> observerMethod;
         
-        public void observer(@Observes 
ProcessObserverMethod<AddObserverMethodExtension, MyEvent> event)
+        public void observer(@Observes ProcessObserverMethod<MyEvent, 
AddObserverMethodExtension> event)
         {
             observerMethod = event.getObserverMethod();