From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 23 May 2007 15:44:33 +0000 (+0000)
Subject: - NPE check (when using JMX, if I remember correctly).
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e4369b89549946ae4806c3fedaade8d4a2336151;p=tomcat7.0

- NPE check (when using JMX, if I remember correctly).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@540979 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 13027b8f9..b5b218419 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -1875,6 +1875,9 @@ public class StandardContext
      * @return The work path
      */ 
     public String getWorkPath() {
+        if (getWorkDir() == null) {
+            return null;
+        }
         File workDir = new File(getWorkDir());
         if (!workDir.isAbsolute()) {
             File catalinaHome = engineBase();