tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1196305 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
Date Tue, 01 Nov 2011 21:51:32 GMT
Author: markt
Date: Tue Nov  1 21:51:32 2011
New Revision: 1196305

URL: http://svn.apache.org/viewvc?rev=1196305&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52113
Don't assume presence of context.xml file with JMX deployment

Modified:
    tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1196305&r1=1196304&r2=1196305&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Tue Nov  1 21:51:32 2011
@@ -594,7 +594,9 @@ public class MBeanFactory {
                                                              "configBaseName");
             String baseName = context.getBaseName();
             File configFile = new File(new File(configPath), baseName+".xml");
-            context.setConfigFile(configFile.toURI().toURL());
+            if (configFile.isFile()) {
+                context.setConfigFile(configFile.toURI().toURL());
+            }
             mserver.invoke(deployer, "manageApp",
                            new Object[] {context},
                            new String[] {"org.apache.catalina.Context"});



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


Mime
View raw message