Author: kkolinko
Date: Thu Aug 25 00:28:41 2011
New Revision: 1161340
URL: http://svn.apache.org/viewvc?rev=1161340&view=rev
Log:
Backport r1161339
Do not pass exception to message template, because exception itself is logged
as well.
Remove argument from message templates that is never passed.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 00:28:41 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=1161340&r1=1161339&r2=1161340&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java Thu
Aug 25 00:28:41 2011
@@ -75,7 +75,7 @@ public class Connector extends Lifecycle
this.protocolHandler = (ProtocolHandler) clazz.newInstance();
} catch (Exception e) {
log.error(sm.getString(
- "coyoteConnector.protocolHandlerInstantiationFailed", e),
e);
+ "coyoteConnector.protocolHandlerInstantiationFailed"), e);
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1161340&r1=1161339&r2=1161340&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
Thu Aug 25 00:28:41 2011
@@ -21,7 +21,7 @@ coyoteConnector.cannotRegisterProtocol=C
coyoteConnector.invalidPort=The connector cannot start since the specified
port value of [{0}] is invalid
coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
coyoteConnector.protocolHandlerInitializationFailed=Protocol handler
initialization failed
-coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler
instantiation failed: {0}
+coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler
instantiation failed
coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed
coyoteConnector.protocolRegistrationFailed=Protocol JMX registration failed
coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties?rev=1161340&r1=1161339&r2=1161340&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
Thu Aug 25 00:28:41 2011
@@ -15,10 +15,10 @@
#
# CoyoteConnector
coyoteConnector.cannotRegisterProtocol = No puedo registrar MBean para el
Protocolo
-coyoteConnector.protocolHandlerDestroyFailed = Fall\u00F3 la destrucci\u00F3n
del manejador de protocolo\: {0}
-coyoteConnector.protocolHandlerInitializationFailed = Fall\u00F3 la
inicializaci\u00F3n del manejador de protocolo\: {0}
-coyoteConnector.protocolHandlerInstantiationFailed = Fall\u00F3 la
instanciaci\u00F3n del manejador de protocolo\: {0}
-coyoteConnector.protocolHandlerStartFailed = Fall\u00F3 el arranque del
manejador de protocolo\: {0}
+coyoteConnector.protocolHandlerDestroyFailed = Fall\u00F3 la destrucci\u00F3n
del manejador de protocolo
+coyoteConnector.protocolHandlerInitializationFailed = Fall\u00F3 la
inicializaci\u00F3n del manejador de protocolo
+coyoteConnector.protocolHandlerInstantiationFailed = Fall\u00F3 la
instanciaci\u00F3n del manejador de protocolo
+coyoteConnector.protocolHandlerStartFailed = Fall\u00F3 el arranque del
manejador de protocolo
coyoteConnector.protocolRegistrationFailed = Fall\u00F3 el registro de JMX
coyoteConnector.protocolHandlerPauseFailed = Ha fallado la pausa del manejador
de protocolo
coyoteConnector.protocolHandlerResumeFailed = Ha fallado el rearranque del
manejador de protocolo
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties?rev=1161340&r1=1161339&r2=1161340&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
Thu Aug 25 00:28:41 2011
@@ -19,10 +19,10 @@
#
coyoteConnector.cannotRegisterProtocol=Impossible d''enregistrer le MBean pour
le Protocol
-coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de
protocole a \u00e9chou\u00e9: {0}
-coyoteConnector.protocolHandlerInitializationFailed=L''initialisation du
gestionnaire de protocole a \u00e9chou\u00e9: {0}
-coyoteConnector.protocolHandlerInstantiationFailed=L''instantiation du
gestionnaire de protocole a \u00e9chou\u00e9: {0}
-coyoteConnector.protocolHandlerStartFailed=Le d\u00e9marrage du gestionnaire
de protocole a \u00e9chou\u00e9: {0}
+coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de
protocole a \u00e9chou\u00e9
+coyoteConnector.protocolHandlerInitializationFailed=L''initialisation du
gestionnaire de protocole a \u00e9chou\u00e9
+coyoteConnector.protocolHandlerInstantiationFailed=L''instantiation du
gestionnaire de protocole a \u00e9chou\u00e9
+coyoteConnector.protocolHandlerStartFailed=Le d\u00e9marrage du gestionnaire
de protocole a \u00e9chou\u00e9
coyoteConnector.protocolRegistrationFailed=L''enregistrement du protocol JMX a
\u00e9chou\u00e9
coyoteConnector.protocolHandlerPauseFailed=La suspension du gestionnaire de
protocole a \u00e9chou\u00e9e
coyoteConnector.protocolHandlerResumeFailed=Le red\u00e9marrage du
gestionnaire de protocole a \u00e9chou\u00e9
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties?rev=1161340&r1=1161339&r2=1161340&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
Thu Aug 25 00:28:41 2011
@@ -19,10 +19,10 @@
#
coyoteConnector.cannotRegisterProtocol=\u305d\u306e\u30d7\u30ed\u30c8\u30b3\u30eb\u306bMBean\u3092\u767b\u9332\u3067\u304d\u307e\u305b\u3093
-coyoteConnector.protocolHandlerDestroyFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u5ec3\u68c4\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
{0}
-coyoteConnector.protocolHandlerInitializationFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u521d\u671f\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
{0}
-coyoteConnector.protocolHandlerInstantiationFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
{0}
-coyoteConnector.protocolHandlerStartFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
{0}
+coyoteConnector.protocolHandlerDestroyFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u5ec3\u68c4\u306b\u5931\u6557\u3057\u307e\u3057\u305f
+coyoteConnector.protocolHandlerInitializationFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u521d\u671f\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f
+coyoteConnector.protocolHandlerInstantiationFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f
+coyoteConnector.protocolHandlerStartFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f
coyoteConnector.protocolRegistrationFailed=\u30d7\u30ed\u30c8\u30b3\u30ebJMX\u306e\u767b\u9332\u306b\u5931\u6557\u3057\u307e\u3057\u305f
coyoteConnector.protocolHandlerPauseFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u4e00\u6642\u505c\u6b62\u306b\u5931\u6557\u3057\u307e\u3057\u305f
coyoteConnector.protocolHandlerResumeFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u518d\u958b\u306b\u5931\u6557\u3057\u307e\u3057\u305f
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
