remm 02/05/30 16:44:14
Modified: catalina/src/share/org/apache/catalina/deploy
NamingResources.java
Log:
- The namingResources wasn't properly reset on stop after the addition of the
entries hashtable.
- Type default to a blank string now for resource links.
Revision Changes Path
1.7 +17 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/NamingResources.java
Index: NamingResources.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/NamingResources.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NamingResources.java 29 May 2002 18:22:41 -0000 1.6
+++ NamingResources.java 30 May 2002 23:44:14 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/NamingResources.java,v
1.6 2002/05/29 18:22:41 remm Exp $
- * $Revision: 1.6 $
- * $Date: 2002/05/29 18:22:41 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/NamingResources.java,v
1.7 2002/05/30 23:44:14 remm Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/05/30 23:44:14 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Naming Context and their associated JNDI context.
*
* @author Remy Maucherat
- * @version $Revision: 1.6 $ $Date: 2002/05/29 18:22:41 $
+ * @version $Revision: 1.7 $ $Date: 2002/05/30 23:44:14 $
*/
public final class NamingResources {
@@ -310,7 +310,7 @@
} else {
Object value = resourceLink.getType();
if (value == null) {
- value = new Integer(0);
+ value = "";
}
entries.put(resourceLink.getName(), value);
}
@@ -542,6 +542,8 @@
*/
public void removeEjb(String name) {
+ entries.remove(name);
+
ContextEjb ejb = null;
synchronized (ejbs) {
ejb = (ContextEjb) ejbs.remove(name);
@@ -561,6 +563,8 @@
*/
public void removeEnvironment(String name) {
+ entries.remove(name);
+
ContextEnvironment environment = null;
synchronized (envs) {
environment = (ContextEnvironment) envs.remove(name);
@@ -580,6 +584,8 @@
*/
public void removeLocalEjb(String name) {
+ entries.remove(name);
+
ContextLocalEjb localEjb = null;
synchronized (localEjbs) {
localEjb = (ContextLocalEjb) ejbs.remove(name);
@@ -611,6 +617,8 @@
*/
public void removeResource(String name) {
+ entries.remove(name);
+
ContextResource resource = null;
synchronized (resources) {
resource = (ContextResource) resources.remove(name);
@@ -630,6 +638,8 @@
*/
public void removeResourceEnvRef(String name) {
+ entries.remove(name);
+
String type = null;
synchronized (resourceEnvRefs) {
type = (String) resourceEnvRefs.remove(name);
@@ -648,6 +658,8 @@
* @param name Name of the resource link to remove
*/
public void removeResourceLink(String name) {
+
+ entries.remove(name);
ContextResourceLink resourceLink = null;
synchronized (resourceLinks) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
