From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 10 Sep 2008 20:02:34 +0000 (+0000)
Subject: Include fix for 43117 in trunk
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d29a2ed2de46461ac1522482bf7d01351ae85dec;p=tomcat7.0

Include fix for 43117 in trunk

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

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 5cfd513d2..719da0989 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -1882,6 +1882,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();