From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 24 Nov 2010 15:58:46 +0000 (+0000)
Subject: Don't swallow error
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=843f02f0c113cdd9389686a7554d4f2db9cd1169;p=tomcat7.0

Don't swallow error

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1038656 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 0adb4654c..463bb93cf 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -152,6 +152,7 @@ standardContext.workPath=Exception obtaining work path for context [{0}]
 standardContext.wrapper.error=JSP file {0} must start with a ''/'
 standardContext.wrapper.warning=WARNING: JSP file {0} must start with a ''/'' in Servlet 2.4
 standardEngine.alreadyStarted=Engine has already been started
+standardEngine.jvmRouteFail=Failed to set Engine's jvmRoute attribute from system property
 standardEngine.mappingError=MAPPING configuration error for server name {0}
 standardEngine.noHost=No Host matches server name {0}
 standardEngine.noHostHeader=HTTP/1.1 request with no Host: header
diff --git a/java/org/apache/catalina/core/StandardEngine.java b/java/org/apache/catalina/core/StandardEngine.java
index f702b503d..bbc1fc3ca 100644
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -62,6 +62,7 @@ public class StandardEngine extends ContainerBase implements Engine {
         try {
             setJvmRoute(System.getProperty("jvmRoute"));
         } catch(Exception ex) {
+            log.warn(sm.getString("standardEngine.jvmRouteFail"));
         }
         // By default, the engine will hold the reloading thread
         backgroundProcessorDelay = 10;