Author: markt
Date: Wed Aug 27 08:44:41 2014
New Revision: 1620815
URL: http://svn.apache.org/r1620815
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=1620815&r1=1620814&r2=1620815&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Wed
Aug 27 08:44:41 2014
@@ -60,7 +60,7 @@ public class CatalinaProperties {
Throwable error = null;
try {
- String configUrl = getConfigUrl();
+ String configUrl = System.getProperty("catalina.config");
if (configUrl != null) {
is = (new URL(configUrl)).openStream();
}
@@ -123,14 +123,6 @@ public class CatalinaProperties {
}
- /**
- * Get the value of the configuration URL.
- */
- private static String getConfigUrl() {
- return System.getProperty("catalina.config");
- }
-
-
// Copied from ExceptionUtils since that class is not visible during start
private static void handleThrowable(Throwable t) {
if (t instanceof ThreadDeath) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
