svn commit: r1434495 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: inject/AbstractInjectable.java portable/InjectionTargetImpl.java

[struberg]

Author: struberg
Date: Wed Jan 16 23:38:15 2013
New Revision: 1434495

URL: http://svn.apache.org/viewvc?rev=1434495&view=rev
Log:
OWB-344 also skip lifecycle if methods are empty

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=1434495&r1=1434494&r2=1434495&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
 Wed Jan 16 23:38:15 2013
@@ -62,7 +62,10 @@ public abstract class AbstractInjectable
     private Producer<?> owner;
     
     private CreationalContextImpl<?> context;
-    
+
+    /**
+     * @deprecated TODO remove this public ThreadLocal!
+     */
     public static ThreadLocal<Object> instanceUnderInjection = new 
ThreadLocal<Object>();
 
     protected AbstractInjectable(Producer<?> owner, CreationalContextImpl<?> 
creationalContext)

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=1434495&r1=1434494&r2=1434495&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
 Wed Jan 16 23:38:15 2013
@@ -304,7 +304,7 @@ public class InjectionTargetImpl<T> exte
     @Override
     public void postConstruct(final T instance)
     {
-        if (postConstructMethods == null)
+        if (postConstructMethods == null || postConstructMethods.size() == 0)
         {
             return;
         }
@@ -340,7 +340,7 @@ public class InjectionTargetImpl<T> exte
     @Override
     public void preDestroy(T instance)
     {
-        if (preDestroyMethods == null)
+        if (preDestroyMethods == null || preDestroyMethods.size() == 0)
         {
             return;
         }