Author: markt
Date: Fri Oct 7 12:20:20 2016
New Revision: 1763755
URL: http://svn.apache.org/viewvc?rev=1763755&view=rev
Log:
Connector logs all exceptions during pause(). No need to StandardService to do
the same.
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/StandardService.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=1763755&r1=1763754&r2=1763755&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Fri Oct
7 12:20:20 2016
@@ -192,7 +192,6 @@ standardServer.shutdownViaPort=A valid s
standardServer.storeConfig.notAvailable=No StoreConfig implementation was
registered as an MBean named [{0}] so no configuration could be saved. A
suitable MBean is normally registered via the StoreConfigLifecyleListener.
standardService.connector.destroyFailed=Failed to destroy connector [{0}]
standardService.connector.initFailed=Failed to initialize connector [{0}]
-standardService.connector.pauseFailed=Failed to pause connector [{0}]
standardService.connector.startFailed=Failed to start connector [{0}]
standardService.connector.stopFailed=Failed to stop connector [{0}]
standardService.engine.startFailed=Failed to start associated Engine
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1763755&r1=1763754&r2=1763755&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Fri
Oct 7 12:20:20 2016
@@ -128,7 +128,6 @@ standardHost.notContext = El Hijo de una
standardHost.nullName = Es necesario poner el nombre de M\u00E1quina
standardServer.shutdownViaPort = Se ha recibido un comando de apagado a
trav\u00E9s del puerto de apagado. Parando la instancia del Servidor.
standardService.connector.initFailed = No pude inicializar el conector [{0}]
-standardService.connector.pauseFailed = No pude pausar el conector [{0}]
standardService.connector.startFailed = No pude arrancar el conector [{0}]
standardService.connector.stopFailed = No pude parar el conector [{0}]
standardService.start.name = Arrancando servicio {0}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1763755&r1=1763754&r2=1763755&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Fri Oct 7
12:20:20 2016
@@ -463,13 +463,7 @@ public class StandardService extends Lif
// Pause connectors first
synchronized (connectorsLock) {
for (Connector connector: connectors) {
- try {
- connector.pause();
- } catch (Exception e) {
- log.error(sm.getString(
- "standardService.connector.pauseFailed",
- connector), e);
- }
+ connector.pause();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
