[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    svn commit: r1427106 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openej
From:       rmannibucau () apache ! org
Date:       2012-12-31 12:28:24
Message-ID: 20121231122825.03FE923889D7 () eris ! apache ! org
[Download RAW message or body]

Author: rmannibucau
Date: Mon Dec 31 12:28:24 2012
New Revision: 1427106

URL: http://svn.apache.org/viewvc?rev=1427106&view=rev
Log:
TOMEE-689 using webapp context first to resolve beans

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java


Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
                
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/mai \
n/java/org/apache/openejb/cdi/WebappBeanManager.java?rev=1427106&r1=1427105&r2=1427106&view=diff
 ==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java \
                (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java \
Mon Dec 31 12:28:24 2012 @@ -77,9 +77,9 @@ public class WebappBeanManager extends B
     @Override
     public Object getInjectableReference(InjectionPoint injectionPoint, \
CreationalContext<?> ctx) {  try {
-            return getParentBm().getInjectableReference(injectionPoint, ctx);
-        } catch (RuntimeException e) {
             return super.getInjectableReference(injectionPoint, ctx);
+        } catch (RuntimeException e) {
+            return getParentBm().getInjectableReference(injectionPoint, ctx);
         }
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]