openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1606404 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java webbeans-tck/testng-dev.xml
Date Sat, 28 Jun 2014 22:17:08 GMT
Author: rmannibucau
Date: Sat Jun 28 22:17:07 2014
New Revision: 1606404

URL: http://svn.apache.org/r1606404
Log:
 getTarget should return instance only once created for @AroundConstruct

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
    openwebbeans/trunk/webbeans-tck/testng-dev.xml

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java?rev=1606404&r1=1606403&r2=1606404&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java
Sat Jun 28 22:17:07 2014
@@ -104,11 +104,6 @@ public abstract class AbstractInvocation
     @Override
     public Object proceed() throws Exception
     {
-        return doProceed();
-    }
-
-    public Object doProceed() throws Exception
-    {
         if (newInstance != null) // already called
         {
             return newInstance;

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java?rev=1606404&r1=1606403&r2=1606404&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
Sat Jun 28 22:17:07 2014
@@ -465,7 +465,7 @@ public class InjectionTargetImpl<T> exte
         {
             try
             {
-                return (T) context.doProceed();
+                return (T) context.getNewInstance();
             }
             catch (final Exception e)
             {

Modified: openwebbeans/trunk/webbeans-tck/testng-dev.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/testng-dev.xml?rev=1606404&r1=1606403&r2=1606404&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/testng-dev.xml (original)
+++ openwebbeans/trunk/webbeans-tck/testng-dev.xml Sat Jun 28 22:17:07 2014
@@ -19,7 +19,7 @@
   <test name="JSR-346 TCK">
     <classes>
       <class
-          name="org.jboss.cdi.tck.interceptors.tests.contract.aroundInvoke.bindings.AroundInvokeInterceptorTest"/>
+          name="org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct.ConstructorInterceptionTest"/>
     </classes>
     <groups>
       <run>



Mime
View raw message