You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openwebbeans.apache.org by st...@apache.org on 2009/11/30 00:33:44 UTC

svn commit: r885296 - /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java

Author: struberg
Date: Sun Nov 29 23:33:44 2009
New Revision: 885296

URL: http://svn.apache.org/viewvc?rev=885296&view=rev
Log:
OWB-182 Even if @PreDestroy is used in an Interceptor, it doesn't need an InvoicationContext parameter

Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=885296&r1=885295&r2=885296&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Sun Nov 29 23:33:44 2009
@@ -941,14 +941,7 @@
         }
         else if (annotation.equals(PreDestroy.class))
         {
-            if (definedInInterceptorClass)
-            {
-                method = WebBeansUtil.checkCommonAnnotationCriterias(clazz, PreDestroy.class, true);
-            }
-            else
-            {
-                method = WebBeansUtil.checkCommonAnnotationCriterias(clazz, PreDestroy.class, false);
-            }
+            method = WebBeansUtil.checkCommonAnnotationCriterias(clazz, PreDestroy.class, false);
         }
 
         if (method != null)