geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r209179 - /geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
Date Tue, 05 Jul 2005 01:57:49 GMT
Author: jgenender
Date: Mon Jul  4 18:57:47 2005
New Revision: 209179

URL: http://svn.apache.org/viewcvs?rev=209179&view=rev
Log:
Fixed GERONIMO-703.  Uses ServerInfo to resolve the path

Modified:
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=209179&r1=209178&r2=209179&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
(original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
Mon Jul  4 18:57:47 2005
@@ -88,7 +88,11 @@
      * GBean constructor (invoked dynamically when the gbean is declared in a plan)
      */
     public TomcatContainer(ClassLoader classLoader, String catalinaHome, ObjectRetriever
engineGBean, ServerInfo serverInfo) {
-        setCatalinaHome(catalinaHome);
+
+        if (catalinaHome == null)
+            catalinaHome = DEFAULT_CATALINA_HOME;
+        
+        setCatalinaHome(serverInfo.resolvePath(catalinaHome));
 
         if (classLoader == null){
             throw new IllegalArgumentException("classLoader cannot be null.");



Mime
View raw message