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/12/02 10:57:19 UTC

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

Author: struberg
Date: Wed Dec  2 09:57:16 2009
New Revision: 886094

URL: http://svn.apache.org/viewvc?rev=886094&view=rev
Log:
OWB-182 rollback; turns out that the TCK was wrong

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=886094&r1=886093&r2=886094&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 Wed Dec  2 09:57:16 2009
@@ -941,7 +941,14 @@
         }
         else if (annotation.equals(PreDestroy.class))
         {
-            method = WebBeansUtil.checkCommonAnnotationCriterias(clazz, PreDestroy.class, false);
+            if (definedInInterceptorClass)
+            {
+                method = WebBeansUtil.checkCommonAnnotationCriterias(clazz, PreDestroy.class, true);
+            }
+            else
+            {
+                method = WebBeansUtil.checkCommonAnnotationCriterias(clazz, PreDestroy.class, false);
+            }
         }
 
         if (method != null)