remm 02/05/29 11:22:41
Modified: catalina/src/share/org/apache/catalina/deploy
NamingResources.java
Log:
- Fix NPE (links have no type).
Revision Changes Path
1.6 +9 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NamingResources.java 29 May 2002 02:16:35 -0000 1.5
+++ NamingResources.java 29 May 2002 18:22:41 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/NamingResources.java,v
1.5 2002/05/29 02:16:35 remm Exp $
- * $Revision: 1.5 $
- * $Date: 2002/05/29 02:16:35 $
+ * $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 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Naming Context and their associated JNDI context.
*
* @author Remy Maucherat
- * @version $Revision: 1.5 $ $Date: 2002/05/29 02:16:35 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/29 18:22:41 $
*/
public final class NamingResources {
@@ -308,7 +308,11 @@
if (entries.containsKey(resourceLink.getName())) {
return;
} else {
- entries.put(resourceLink.getName(), resourceLink.getType());
+ Object value = resourceLink.getType();
+ if (value == null) {
+ value = new Integer(0);
+ }
+ entries.put(resourceLink.getName(), value);
}
synchronized (resourceLinks) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
