Author: markt
Date: Wed May 14 08:46:23 2014
New Revision: 1594519
URL: http://svn.apache.org/r1594519
Log:
Remove unused code
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1594393
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1594519&r1=1594518&r2=1594519&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed
May 14 08:46:23 2014
@@ -1682,7 +1682,6 @@ public class NioEndpoint extends Abstrac
}
private void doRun(SelectionKey key, KeyAttachment ka) {
- boolean launch = false;
try {
int handshake = -1;
@@ -1774,16 +1773,6 @@ public class NioEndpoint extends Abstrac
socket.getPoller().cancelledKey(key,SocketStatus.ERROR,false);
}
} 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/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=1594519&r1=1594518&r2=1594519&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Wed May 14 08:46:23 2014
@@ -40,7 +40,6 @@ endpoint.init.bind=Socket bind failed: [
endpoint.init.listen=Socket listen failed: [{0}] {1}
endpoint.init.notavail=APR not available
endpoint.accept.fail=Socket accept failed
-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/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties?rev=1594519&r1=1594518&r2=1594519&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
Wed May 14 08:46:23 2014
@@ -30,7 +30,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]
