tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r821377 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
Date Sat, 03 Oct 2009 17:52:55 GMT
Author: markt
Date: Sat Oct  3 17:52:55 2009
New Revision: 821377

URL: http://svn.apache.org/viewvc?rev=821377&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47796
Fix OpenEJB integration. Reset annotation processor on context stop.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=821377&r1=821376&r2=821377&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Oct  3 17:52:55 2009
@@ -251,12 +251,6 @@
     tomcat-juli.jar from ${CATALINA_HOME}/bin if they want, though I doubt
     that that will be necessary.
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47796
-  Fix OpenEJB integration. Reset annotation processor on context stop.
-  https://issues.apache.org/bugzilla/attachment.cgi?id=24222
-  +1: markt, rjung, kkolinko
-  -1: 
-
 * Make FileHandler.java extensible
   http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?r1=666232&r2=709018&pathrev=793882&view=patch
   +1: fhanik, jim, markt, kkolinko

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=821377&r1=821376&r2=821377&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Sat Oct  3 17:52:55
2009
@@ -4690,6 +4690,8 @@
         applicationEventListenersObjects = new Object[0];
         applicationLifecycleListenersObjects = new Object[0];
         
+        annotationProcessor = null;
+
         if(log.isDebugEnabled())
             log.debug("resetContext " + oname);
     }

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=821377&r1=821376&r2=821377&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Oct  3 17:52:55 2009
@@ -134,6 +134,10 @@
         old method. Patch provided by Christopher Schultz. (markt)
       </fix>
       <fix>
+        <bug>47796</bug>: Fix OpenEJB integration. Reset annotation processor
on
+        context stop. (markt)
+      </fix>
+      <fix>
         <bug>47826</bug>: Correct error in debug message in
         org.apache.catalina.Bootstrap (markt)
       </fix>



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


Mime
View raw message