tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r407933 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/util/AnnotationProcessor.java jasper/runtime/AnnotationProcessor.java
Date Sat, 20 May 2006 00:04:55 GMT
Author: remm
Date: Fri May 19 17:04:55 2006
New Revision: 407933

URL: http://svn.apache.org/viewvc?rev=407933&view=rev
Log:
- Fix cut & paste bug, submitted by Stan Silvert.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationProcessor.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java?rev=407933&r1=407932&r2=407933&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java Fri May 19
17:04:55 2006
@@ -23,6 +23,7 @@
 
 import javax.annotation.EJB;
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
 import javax.naming.NamingException;
 import javax.persistence.PersistenceContext;
@@ -84,7 +85,7 @@
         Method[] methods = IntrospectionUtils.findMethods(instance.getClass());
         Method preDestroy = null;
         for (int i = 0; i < methods.length; i++) {
-            if (methods[i].isAnnotationPresent(PostConstruct.class)) {
+            if (methods[i].isAnnotationPresent(PreDestroy.class)) {
                 if ((preDestroy != null) 
                         || (methods[i].getParameterTypes().length != 0)
                         || (Modifier.isStatic(methods[i].getModifiers())) 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationProcessor.java?rev=407933&r1=407932&r2=407933&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationProcessor.java Fri May 19
17:04:55 2006
@@ -23,6 +23,7 @@
 
 import javax.annotation.EJB;
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -140,7 +141,7 @@
         Method[] methods = instance.getClass().getMethods();
         Method preDestroy = null;
         for (int i = 0; i < methods.length; i++) {
-            if (methods[i].isAnnotationPresent(PostConstruct.class)) {
+            if (methods[i].isAnnotationPresent(PreDestroy.class)) {
                 if ((preDestroy != null) 
                         || (methods[i].getParameterTypes().length != 0)
                         || (Modifier.isStatic(methods[i].getModifiers())) 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message