Author: markt
Date: Fri Apr 25 11:16:36 2008
New Revision: 651675
URL: http://svn.apache.org/viewvc?rev=651675&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43470
Based on a changes provided by Lucas Galfaso
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=651675&r1=651674&r2=651675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java Fri Apr
25 11:16:36 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);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
