tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r693962 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Date Wed, 10 Sep 2008 20:02:34 GMT
Author: markt
Date: Wed Sep 10 13:02:34 2008
New Revision: 693962

URL: http://svn.apache.org/viewvc?rev=693962&view=rev
Log:
Include fix for 43117 in trunk

Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=693962&r1=693961&r2=693962&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Sep 10 13:02:34 2008
@@ -1882,6 +1882,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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message