Author: remm
Date: Wed May 23 08:44:33 2007
New Revision: 540979
URL: http://svn.apache.org/viewvc?view=rev&rev=540979
Log:
- NPE check (when using JMX, if I remember correctly).
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?view=diff&rev=540979&r1=540978&r2=540979
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Wed
May 23 08:44:33 2007
@@ -1875,6 +1875,9 @@
* @return The work path
*/
public String getWorkPath() {
+ if (getWorkDir() == null) {
+ return null;
+ }
File workDir = new File(getWorkDir());
if (!workDir.isAbsolute()) {
File catalinaHome = engineBase();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
