tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r652623 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/deploy/NamingResources.java webapps/docs/changelog.xml
Date Thu, 01 May 2008 18:58:16 GMT
Author: markt
Date: Thu May  1 11:58:16 2008
New Revision: 652623

URL: http://svn.apache.org/viewvc?rev=652623&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43470
Fix various class cast exceptions. Based on a patch by Lucas Galfaso.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.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=652623&r1=652622&r2=652623&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May  1 11:58:16 2008
@@ -76,12 +76,6 @@
   +1: fhanik, markt
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43470
-  Various copy and paste errors
-  http://svn.apache.org/viewvc?rev=651675&view=rev
-  +1: markt, remm, fhanik
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578
   http://svn.apache.org/viewvc?rev=651713&view=rev
   Tomcat doesn't start if installation path contains a space

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=652623&r1=652622&r2=652623&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java Thu May  1 11:58:16
2008
@@ -320,7 +320,7 @@
             entries.put(resource.getName(), resource.getType());
         }
 
-        synchronized (localEjbs) {
+        synchronized (resourceEnvRefs) {
             resource.setNamingResources(this);
             resourceEnvRefs.put(resource.getName(), resource);
         }
@@ -681,7 +681,7 @@
 
         ContextLocalEjb localEjb = null;
         synchronized (localEjbs) {
-            localEjb = (ContextLocalEjb) ejbs.remove(name);
+            localEjb = (ContextLocalEjb) localEjbs.remove(name);
         }
         if (localEjb != null) {
             support.firePropertyChange("localEjb", localEjb, null);
@@ -755,13 +755,14 @@
 
         entries.remove(name);
 
-        String type = null;
+        ContextResourceEnvRef resourceEnvRef = null;
         synchronized (resourceEnvRefs) {
-            type = (String) resourceEnvRefs.remove(name);
+            resourceEnvRef =
+                (ContextResourceEnvRef) resourceEnvRefs.remove(name);
         }
-        if (type != null) {
-            support.firePropertyChange("resourceEnvRef",
-                                       name + ":" + type, null);
+        if (resourceEnvRef != null) {
+            support.firePropertyChange("resourceEnvRef", resourceEnvRef, null);
+            resourceEnvRef.setNamingResources(null);
         }
 
     }

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=652623&r1=652622&r2=652623&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May  1 11:58:16 2008
@@ -40,6 +40,10 @@
         using the webapp class loader when we create them. (markt)
       </fix>
       <fix>
+        <bug>43470</bug>: Fix various class cast exceptions. Based on a patch
+        by Lucas Galfaso. (markt)
+      </fix>
+      <fix>
         <bug>43683</bug>: Fix 404 that could occur if a Servlet is accessed
         while the context is reloading. (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