You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/06/22 11:41:20 UTC

svn commit: r787181 - /geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java

Author: xuhaihong
Date: Mon Jun 22 09:41:19 2009
New Revision: 787181

URL: http://svn.apache.org/viewvc?rev=787181&view=rev
Log:
GERONIMO-4698 Jetty7 could not handle the non-existed temp path

Modified:
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java?rev=787181&r1=787180&r2=787181&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java Mon Jun 22 09:41:19 2009
@@ -194,14 +194,9 @@
         webAppContext.setCompactPath(compactPath);
 
         if (workDir == null) {
-            workDir = contextPath;
+            workDir = contextPath.replace('/', '_');
         }
-        File tempFolder = jettyContainer.resolveToJettyHome(workDir);
-        if (!tempFolder.exists()) {
-            tempFolder.mkdirs();
-            tempFolder.deleteOnExit();
-        }
-        this.webAppContext.setTempDirectory(tempFolder);
+        webAppContext.setTempDirectory(jettyContainer.resolveToJettyHome(workDir));
 
 
         //install jasper injection support if required