tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1240048 - /tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Date Fri, 03 Feb 2012 09:44:39 GMT
Author: markt
Date: Fri Feb  3 09:44:39 2012
New Revision: 1240048

URL: http://svn.apache.org/viewvc?rev=1240048&view=rev
Log:
Review comments on r1239522 from kkolinko

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1240048&r1=1240047&r2=1240048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Feb  3 09:44:39 2012
@@ -154,11 +154,9 @@ public class Tomcat {
      *
      * By default, if this method is not called, we use:
      *  - system properties - catalina.base, catalina.home
-     *  - $HOME/tomcat.$PORT
-     * ( /tmp doesn't seem a good choice for security ).
+     *  - $PWD/tomcat.$PORT
+     * (/tmp doesn't seem a good choice for security).
      *
-     *
-     * TODO: better default ? Maybe current dir ?
      * TODO: disable work dir if not needed ( no jsp, etc ).
      */
     public void setBaseDir(String basedir) {
@@ -596,26 +594,25 @@ public class Tomcat {
 
         File baseFile = new File(basedir);
         baseFile.mkdirs();
-        if (!baseFile.isAbsolute()) {
-            try {
-                baseFile = baseFile.getCanonicalFile();
-            } catch (IOException e) {
-                baseFile = baseFile.getAbsoluteFile();
-            }
+        try {
+            baseFile = baseFile.getCanonicalFile();
+        } catch (IOException e) {
+            baseFile = baseFile.getAbsoluteFile();
         }
         server.setCatalinaBase(baseFile);
+        basedir = baseFile.getPath();
 
-        if (catalinaHome != null) {
+        if (catalinaHome == null) {
+            server.setCatalinaHome(baseFile);
+        } else {
             File homeFile = new File(catalinaHome);
             homeFile.mkdirs();
-            if (!homeFile.isAbsolute()) {
-                try {
-                    homeFile = homeFile.getCanonicalFile();
-                } catch (IOException e) {
-                    homeFile = homeFile.getAbsoluteFile();
-                }
+            try {
+                homeFile = homeFile.getCanonicalFile();
+            } catch (IOException e) {
+                homeFile = homeFile.getAbsoluteFile();
             }
-            server.setCatalinaBase(homeFile);
+            server.setCatalinaHome(homeFile);
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message