You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/11/24 16:58:46 UTC
svn commit: r1038656 - in /tomcat/trunk/java/org/apache/catalina/core:
LocalStrings.properties StandardEngine.java
Author: markt
Date: Wed Nov 24 15:58:46 2010
New Revision: 1038656
URL: http://svn.apache.org/viewvc?rev=1038656&view=rev
Log:
Don't swallow error
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1038656&r1=1038655&r2=1038656&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Wed Nov 24 15:58:46 2010
@@ -152,6 +152,7 @@ standardContext.workPath=Exception obtai
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
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1038656&r1=1038655&r2=1038656&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Wed Nov 24 15:58:46 2010
@@ -62,6 +62,7 @@ public class StandardEngine extends Cont
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re:Re:svn commit: r1038656 - in
/tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties
StandardEngine.java
Posted by xiexiaoyang <xz...@126.com>.
I am very sorry for a unexpected operation.
At 2010-11-26 10:47:51，xiexiaoyang <xz...@126.com> wrote:
>dev-unsubscribe@tomcat.apache.org
>
>
>
>
>At 2010-11-24 23:58:46，markt@apache.org wrote:
>
>>Author: markt
>>Date: Wed Nov 24 15:58:46 2010
>>New Revision: 1038656
>>
>>URL: http://svn.apache.org/viewvc?rev=1038656&view=rev
>>Log:
>>Don't swallow error
>>
>>Modified:
>> tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
>> tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
>>
>>Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
>>URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1038656&r1=1038655&r2=1038656&view=diff
>>==============================================================================
>>--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties (original)
>>+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Wed Nov 24 15:58:46 2010
>>@@ -152,6 +152,7 @@ standardContext.workPath=Exception obtai
>> 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
>>
>>Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
>>URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1038656&r1=1038655&r2=1038656&view=diff
>>==============================================================================
>>--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
>>+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Wed Nov 24 15:58:46 2010
>>@@ -62,6 +62,7 @@ public class StandardEngine extends Cont
>> 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;
>>
>>
>>
>>---------------------------------------------------------------------
>>To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>>For additional commands, e-mail: dev-help@tomcat.apache.org
>>
Re:svn commit: r1038656 - in
/tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties
StandardEngine.java
Posted by xiexiaoyang <xz...@126.com>.
dev-unsubscribe@tomcat.apache.org
At 2010-11-24 23:58:46，markt@apache.org wrote:
>Author: markt
>Date: Wed Nov 24 15:58:46 2010
>New Revision: 1038656
>
>URL: http://svn.apache.org/viewvc?rev=1038656&view=rev
>Log:
>Don't swallow error
>
>Modified:
> tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
> tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
>
>Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
>URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1038656&r1=1038655&r2=1038656&view=diff
>==============================================================================
>--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties (original)
>+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Wed Nov 24 15:58:46 2010
>@@ -152,6 +152,7 @@ standardContext.workPath=Exception obtai
> 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
>
>Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
>URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1038656&r1=1038655&r2=1038656&view=diff
>==============================================================================
>--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
>+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Wed Nov 24 15:58:46 2010
>@@ -62,6 +62,7 @@ public class StandardEngine extends Cont
> 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;
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>For additional commands, e-mail: dev-help@tomcat.apache.org
>