costin 01/10/12 21:24:00
Modified: src/share/org/apache/tomcat/core ContextManager.java
Log:
2 extra checks for NPE ( possible on strange cases with EmbededTomcat )
Revision Changes Path
1.197 +4 -2 jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- ContextManager.java 2001/10/10 18:47:06 1.196
+++ ContextManager.java 2001/10/13 04:24:00 1.197
@@ -250,7 +250,8 @@
*/
public void setHome(String home) {
this.home=home;
- System.getProperties().put(TOMCAT_HOME, home );
+ if( home != null )
+ System.getProperties().put(TOMCAT_HOME, home );
}
public String getHome() {
@@ -311,7 +312,8 @@
}
public void setProperty( String name, String value ) {
- properties.put( name, value );
+ if( name!=null && value!=null )
+ properties.put( name, value );
}
public Hashtable getProperties() {
|