modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
| 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit ace32579675ccf0f02dce110d669b57261a70afb
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Wed Jul 3 17:05:01 2013 +0200
Revert "Bug 863502 - EMS ConnectionFactory.discoverServerClasses can throw
OutOfMemoryError"
This reverts commit faf0013f511894eb2c7b9ef14f87b5e87d657154.
diff --git
a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
index c289069..f1e2c51 100644
---
a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
+++
b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java
@@ -195,11 +195,10 @@ public class TomcatServerComponent<T extends
ResourceComponent<?>> implements JM
// to have a version compatible local install and set the install path to
the local path, even though
// the server url was remote.
String catalinaHome =
pluginConfig.getSimpleValue(PLUGIN_CONFIG_CATALINA_HOME_PATH, null);
- boolean hasLocalJars = catalinaHome != null && new
File(catalinaHome, "lib").isDirectory();
+ boolean hasLocalJars = new File(catalinaHome).isDirectory();
if (hasLocalJars) {
- String libDir = new File(catalinaHome,
"lib").getAbsolutePath();
- connectionSettings.setLibraryURI(libDir);
+ connectionSettings.setLibraryURI(catalinaHome);
connectionFactory.discoverServerClasses(connectionSettings);
// Tell EMS to make copies of jar files so that the ems classloader
doesn't lock
Show replies by date