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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
