svn commit: r1580477 - /tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java

[rmannibucau]

Author: rmannibucau
Date: Sun Mar 23 09:30:05 2014
New Revision: 1580477

URL: http://svn.apache.org/r1580477
Log:
opps didin't commit the right patch, sorry

Modified:
    
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java

Modified: 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java?rev=1580477&r1=1580476&r2=1580477&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
 Sun Mar 23 09:30:05 2014
@@ -172,11 +172,12 @@ public class ObserverManager {
 
             final Class eventType = event.getClass();
             final Method method = methods.get(eventType);
-            if (internal && method == null) {
-                return null;
+
+            if (method != null) {
+                return new Invocation(this, method, event);
             }
 
-            if (method == null && AfterEventImpl.class.isInstance(event)) {
+            if (AfterEventImpl.class.isInstance(event)) {
                 final Type[] types = new Type[] 
{AfterEventImpl.class.cast(event).getEvent().getClass()};
                 final Type raw = AfterEvent.class;
                 final Type type = new ParameterizedTypeImpl(types, raw) ;
@@ -185,7 +186,7 @@ public class ObserverManager {
                         return new Invocation(this, m.getValue(), event);
                     }
                 }
-            } else if (method == null && 
BeforeEventImpl.class.isInstance(event)) {
+            } else if (BeforeEventImpl.class.isInstance(event)) {
                 final Type[] types = new Type[] { 
BeforeEventImpl.class.cast(event).getEvent().getClass() };
                 final Type raw = BeforeEvent.class;
                 final Type type = new ParameterizedTypeImpl(types, raw) ;
@@ -196,9 +197,11 @@ public class ObserverManager {
                 }
             }
 
-            if (method != null) {
-                return new Invocation(this, method, event);
-            } else if (defaultMethod != null) {
+            if (internal) {
+                return null;
+            }
+
+            if (defaultMethod != null) {
                 return new Invocation(this, defaultMethod, event);
             }
             return null;