Author: markt
Date: Fri Jan 30 14:23:14 2015
New Revision: 1656025
URL: http://svn.apache.org/r1656025
Log:
Remove NO-OP method implementation and hooks that were calling it.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1656025&r1=1656024&r2=1656025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Fri Jan 30
14:23:14 2015
@@ -16,8 +16,6 @@
*/
package org.apache.coyote.ajp;
-import javax.net.ssl.SSLEngine;
-
import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -96,10 +94,6 @@ public class AjpNio2Protocol extends Abs
}
@Override
- public void onCreateSSLEngine(SSLEngine engine) {
- }
-
- @Override
public void closeAll() {
for (Nio2Channel channel : connections.keySet()) {
((Nio2Endpoint)
getProtocol().getEndpoint()).closeSocket(channel.getSocket());
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1656025&r1=1656024&r2=1656025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Fri Jan 30
14:23:14 2015
@@ -19,8 +19,6 @@ package org.apache.coyote.ajp;
import java.nio.channels.SocketChannel;
import java.util.Iterator;
-import javax.net.ssl.SSLEngine;
-
import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -123,10 +121,5 @@ public class AjpNioProtocol extends Abst
socket.registerReadInterest();
}
}
-
-
- @Override
- public void onCreateSSLEngine(SSLEngine engine) {
- }
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1656025&r1=1656024&r2=1656025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Fri Jan
30 14:23:14 2015
@@ -18,8 +18,6 @@ package org.apache.coyote.http11;
import java.nio.channels.ReadPendingException;
-import javax.net.ssl.SSLEngine;
-
import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -171,13 +169,6 @@ public class Http11Nio2Protocol extends
}
}
- @Override
- public void onCreateSSLEngine(SSLEngine engine) {
- if (getProtocol().npnHandler != null) {
- getProtocol().npnHandler.onCreateEngine(engine);
- }
- }
-
@Override
public void closeAll() {
for (Nio2Channel channel : connections.keySet()) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1656025&r1=1656024&r2=1656025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Fri Jan
30 14:23:14 2015
@@ -19,8 +19,6 @@ package org.apache.coyote.http11;
import java.nio.channels.SocketChannel;
import java.util.Iterator;
-import javax.net.ssl.SSLEngine;
-
import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -207,12 +205,5 @@ public class Http11NioProtocol extends A
socket.registerReadInterest();
}
}
-
- @Override
- public void onCreateSSLEngine(SSLEngine engine) {
- if (getProtocol().npnHandler != null) {
- getProtocol().npnHandler.onCreateEngine(engine);
- }
- }
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java?rev=1656025&r1=1656024&r2=1656025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java Fri Jan 30
14:23:14 2015
@@ -47,12 +47,4 @@ public interface NpnHandler<S> {
* @param adapter
*/
public void init(final AbstractEndpoint<S> ep, long sslContext, Adapter
adapter);
-
- /**
- * Called when a SSLSocket or SSLEngine are first used, to initialize
- * NPN extension.
- *
- * @param socket SSLEngine or SSLSocket
- */
- void onCreateEngine(Object socket);
}
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java?rev=1656025&r1=1656024&r2=1656025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java Fri Jan 30
14:23:14 2015
@@ -104,9 +104,4 @@ public class SpdyAprNpnHandler implement
// No need to keep tomcat thread busy - but socket will be handled by
apr socket context.
return SocketState.LONG;
}
-
-
- @Override
- public void onCreateEngine(Object socket) {
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java?rev=1656025&r1=1656024&r2=1656025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java Fri Jan 30
14:23:14 2015
@@ -19,8 +19,6 @@ package org.apache.coyote.spdy;
import java.io.IOException;
import java.nio.channels.SocketChannel;
-import javax.net.ssl.SSLEngine;
-
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.ajp.Constants;
import org.apache.juli.logging.Log;
@@ -137,10 +135,5 @@ public class SpdyProxyProtocol extends A
public void release(SocketChannel socket) {
// TODO Auto-generated method stub
}
-
- @Override
- public void onCreateSSLEngine(SSLEngine engine) {
- // No SSL in proxy. Should be a NO-OP.
- }
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1656025&r1=1656024&r2=1656025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Jan 30
14:23:14 2015
@@ -543,7 +543,6 @@ public class Nio2Endpoint extends Abstra
engine.setEnabledCipherSuites(enabledCiphers);
engine.setEnabledProtocols(enabledProtocols);
- handler.onCreateSSLEngine(engine);
return engine;
}
@@ -1473,7 +1472,6 @@ public class Nio2Endpoint extends Abstra
public interface Handler extends AbstractEndpoint.Handler<Nio2Channel> {
public void release(SocketWrapperBase<Nio2Channel> socket);
public void closeAll();
- public void onCreateSSLEngine(SSLEngine engine);
}
public void addTimeout(SocketWrapperBase<Nio2Channel> socket) {
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=1656025&r1=1656024&r2=1656025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Jan 30
14:23:14 2015
@@ -575,7 +575,6 @@ public class NioEndpoint extends Abstrac
engine.setEnabledCipherSuites(enabledCiphers);
engine.setEnabledProtocols(enabledProtocols);
- handler.onCreateSSLEngine(engine);
return engine;
}
@@ -1659,7 +1658,6 @@ public class NioEndpoint extends Abstrac
public interface Handler extends AbstractEndpoint.Handler<NioChannel> {
public void release(SocketWrapperBase<NioChannel> socket);
public void release(SocketChannel socket);
- public void onCreateSSLEngine(SSLEngine engine);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
