Author: markt
Date: Tue May 13 21:24:04 2014
New Revision: 1594393
URL: http://svn.apache.org/r1594393
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1594393&r1=1594392&r2=1594393&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue May 13
21:24:04 2014
@@ -1532,7 +1532,6 @@ public class NioEndpoint extends Abstrac
}
private void doRun(SelectionKey key, KeyAttachment ka) {
- boolean launch = false;
try {
int handshake = -1;
@@ -1631,16 +1630,6 @@ public class NioEndpoint extends Abstrac
socket.getPoller().cancelledKey(key,SocketStatus.ERROR);
}
} finally {
- if (launch) {
- try {
- getExecutor().execute(new SocketProcessor(socket,
SocketStatus.OPEN_READ));
- } catch (NullPointerException npe) {
- if (running) {
- log.error(sm.getString("endpoint.launch.fail"),
- npe);
- }
- }
- }
socket = null;
status = null;
//return to cache
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=1594393&r1=1594392&r2=1594393&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Tue May 13 21:24:04 2014
@@ -40,7 +40,6 @@ endpoint.init.listen=Socket listen faile
endpoint.init.notavail=APR not available
endpoint.accept.fail=Socket accept failed
endpoint.getAttribute=[{0}] is [{1}]
-endpoint.launch.fail=Failed to launch new runnable
endpoint.poll.limitedpollsize=Failed to create poller with specified size of
{0}
endpoint.poll.initfail=Poller creation failed
endpoint.poll.fail=Critical poller failure (restarting poller): [{0}] {1}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties?rev=1594393&r1=1594392&r2=1594393&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
Tue May 13 21:24:04 2014
@@ -21,7 +21,6 @@ endpoint.init.bind = Ligado de conector
endpoint.init.listen = Escucha de conector fall\u00F3\: [{0}] {1}
endpoint.init.notavail = APR no disponible
endpoint.accept.fail = Aceptaci\u00F3n de conector fall\u00F3
-endpoint.launch.fail = No pude lanzar nuevo ejecutable
endpoint.poll.limitedpollsize = No pude crear encuestador de medida
espec\u00EDfica de {0}
endpoint.poll.initfail = Fall\u00F3 la creaci\u00F3n del encuestador
endpoint.poll.fail = Fallo cr\u00EDtico de encuestador (reiniciando
encuestador)\: [{0}] {1}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
