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/12/08 14:06:47 UTC
svn commit: r1043399 - in /tomcat/trunk/java/org/apache/coyote: ./ ajp/
http11/
Author: markt
Date: Wed Dec 8 13:06:46 2010
New Revision: 1043399
URL: http://svn.apache.org/viewvc?rev=1043399&view=rev
Log:
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Pull up stop()
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java?rev=1043399&r1=1043398&r2=1043399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java Wed Dec 8 13:06:46 2010
@@ -365,13 +365,28 @@ public abstract class AbstractProtocolHa
endpoint.resume();
} catch (Exception ex) {
getLog().error(sm.getString("abstractProtocolHandler.actionError",
- "resule", getName()), ex);
+ "resume", getName()), ex);
throw ex;
}
}
@Override
+ public final void stop() throws Exception {
+ try {
+ endpoint.stop();
+ } catch (Exception ex) {
+ getLog().error(sm.getString("abstractProtocolHandler.action",
+ "Stopping"), ex);
+ throw ex;
+ }
+ if(getLog().isInfoEnabled())
+ getLog().info(sm.getString("abstractProtocolHandler.actionError",
+ "stop", getName()));
+ }
+
+
+ @Override
public final void destroy() {
if(getLog().isInfoEnabled()) {
getLog().info(sm.getString("abstractProtocolHandler.action",
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1043399&r1=1043398&r2=1043399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Wed Dec 8 13:06:46 2010
@@ -71,19 +71,4 @@ public abstract class AbstractAjpProtoco
protected String getNamePrefix() {
return ("ajp");
}
-
-
- // ------------------------------------------------------- Lifecycle methods
-
- @Override
- public void stop() throws Exception {
- try {
- endpoint.stop();
- } catch (Exception ex) {
- getLog().error(sm.getString("ajpprotocol.endpoint.stoperror"), ex);
- throw ex;
- }
- if (getLog().isInfoEnabled())
- getLog().info(sm.getString("ajpprotocol.stop", getName()));
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1043399&r1=1043398&r2=1043399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Wed Dec 8 13:06:46 2010
@@ -29,7 +29,6 @@ ajpprotocol.endpoint.stoperror=Error sto
ajpprotocol.init=Initializing Coyote AJP/1.3 on {0}
ajpprotocol.proto.error=Error reading request, ignored
ajpprotocol.start=Starting Coyote AJP/1.3 on {0}
-ajpprotocol.stop=Stopping Coyote AJP/1.3 on {0}
ajpprotocol.failedread=Socket read failed
ajpprotocol.failedwrite=Socket write failed
ajpprotocol.request.register=Error registering request processor in JMX
Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties?rev=1043399&r1=1043398&r2=1043399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties Wed Dec 8 13:06:46 2010
@@ -18,7 +18,6 @@ ajpprotocol.endpoint.starterror = Error
ajpprotocol.init = Inicializando Coyote AJP/1.3 en {0}
ajpprotocol.proto.error = Error leyendo requerimiento, ignorado
ajpprotocol.start = Arrancando Coyote AJP/1.3 en {0}
-ajpprotocol.stop = Parando Coyote AJP/1.3 en {0}
ajpprotocol.failedread = Fallo en lectura de Conector
ajpprotocol.failedwrite = Fallo en escritura de Conector
ajpprotocol.request.register = Error registrando procesador de requerimiento en JMX
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1043399&r1=1043398&r2=1043399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed Dec 8 13:06:46 2010
@@ -189,20 +189,4 @@ public abstract class AbstractHttp11Prot
protected String getNamePrefix() {
return ("http");
}
-
-
- // ------------------------------------------------------- Lifecycle methods
-
- @Override
- public void stop() throws Exception {
- try {
- endpoint.stop();
- } catch (Exception ex) {
- getLog().error(sm.getString("http11protocol.endpoint.stoperror"),
- ex);
- throw ex;
- }
- if(getLog().isInfoEnabled())
- getLog().info(sm.getString("http11protocol.stop", getName()));
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties?rev=1043399&r1=1043398&r2=1043399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties Wed Dec 8 13:06:46 2010
@@ -25,7 +25,6 @@ http11protocol.proto.socketexception.deb
http11protocol.proto.socketexception.info=SocketException reading request, ignored
http11protocol.socketfactory.initerror=Error initializing socket factory
http11protocol.start=Starting Coyote HTTP/1.1 on {0}
-http11protocol.stop=Stopping Coyote HTTP/1.1 on {0}
http11processor.regexp.error=Error parsing regular expression {0}
http11processor.filter.unknown=Unknown filter {0}
Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties?rev=1043399&r1=1043398&r2=1043399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties Wed Dec 8 13:06:46 2010
@@ -23,7 +23,6 @@ http11protocol.proto.socketexception.deb
http11protocol.proto.socketexception.info = SocketException leyendo requerimiento, ignorada
http11protocol.socketfactory.initerror = Error inicializando f\u00E1brica de enchufes (sockets)
http11protocol.start = Arrancando Coyote HTTP/1.1 en puerto {0}
-http11protocol.stop = Parando Coyote HTTP/1.1 en puerto {0}
http11processor.regexp.error = Error al analizar expresi\u00F3n regular {0}
http11processor.filter.unknown = Filtro desconocido {0}
Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties?rev=1043399&r1=1043398&r2=1043399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties Wed Dec 8 13:06:46 2010
@@ -23,7 +23,6 @@ http11protocol.proto.socketexception.deb
http11protocol.proto.socketexception.info=Exception "Socket" (SocketException) \u00e0 la lecture de la requ\u00eate, ignor\u00e9
http11protocol.socketfactory.initerror=Erreur \u00e0 l'initialisation du cr\u00e9ateur de socket (socket factory)
http11protocol.start=D\u00e9marrage de Coyote HTTP/1.1 sur {0}
-http11protocol.stop=Arr\u00eat de Coyote HTTP/1.1 sur {0}
iib.eof.error=Fin de flux (EOF) inattendue \u00e0 la lecture sur la socket
iib.requestheadertoolarge.error=L'ent\u00eate de requ\u00eate est trop important
Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties?rev=1043399&r1=1043398&r2=1043399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties Wed Dec 8 13:06:46 2010
@@ -23,7 +23,6 @@ http11protocol.proto.socketexception.deb
http11protocol.proto.socketexception.info=\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u8aad\u307f\u8fbc\u307f\u4e2d\u306eSocketException\u3067\u3059\u304c\u3001\u7121\u8996\u3055\u308c\u307e\u3057\u305f
http11protocol.socketfactory.initerror=\u30bd\u30b1\u30c3\u30c8\u30d5\u30a1\u30af\u30c8\u30ea\u3092\u521d\u671f\u5316\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
http11protocol.start=Coyote HTTP/1.1\u3092 {0} \u3067\u8d77\u52d5\u3057\u307e\u3059
-http11protocol.stop=Coyote HTTP/1.1\u3092 {0} \u3067\u505c\u6b62\u3057\u307e\u3059
iib.eof.error=\u30bd\u30b1\u30c3\u30c8\u304b\u3089\u4e88\u671f\u3057\u306a\u3044EOF\u3092\u8aad\u307f\u8fbc\u307f\u307e\u3057\u305f
iib.requestheadertoolarge.error=\u30ea\u30af\u30a8\u30b9\u30c8\u30d8\u30c3\u30c0\u304c\u9577\u3059\u304e\u307e\u3059
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org