Author: markt
Date: Wed Apr 14 22:24:17 2010
New Revision: 934223
URL: http://svn.apache.org/viewvc?rev=934223&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49104
Generics
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=934223&r1=934222&r2=934223&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Wed Apr 14
22:24:17 2010
@@ -321,8 +321,8 @@ public class AjpProtocol
protected AjpProtocol proto;
protected AtomicLong registerCount = new AtomicLong(0);
protected RequestGroupInfo global = new RequestGroupInfo();
- protected ConcurrentHashMap<SocketWrapper, AjpProcessor> connections =
- new ConcurrentHashMap<SocketWrapper, AjpProcessor>();
+ protected ConcurrentHashMap<SocketWrapper<Socket>, AjpProcessor>
connections =
+ new ConcurrentHashMap<SocketWrapper<Socket>, AjpProcessor>();
protected ConcurrentLinkedQueue<AjpProcessor> recycledProcessors =
new ConcurrentLinkedQueue<AjpProcessor>() {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=934223&r1=934222&r2=934223&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Wed Apr 14
22:24:17 2010
@@ -32,7 +32,6 @@ import org.apache.coyote.RequestInfo;
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.net.JIoEndpoint;
-import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.SSLImplementation;
import org.apache.tomcat.util.net.ServerSocketFactory;
import org.apache.tomcat.util.net.SocketStatus;
@@ -190,8 +189,8 @@ public class Http11Protocol extends Abst
protected Http11Protocol proto;
protected AtomicLong registerCount = new AtomicLong(0);
protected RequestGroupInfo global = new RequestGroupInfo();
- protected ConcurrentHashMap<SocketWrapper, Http11Processor>
connections =
- new ConcurrentHashMap<SocketWrapper, Http11Processor>();
+ protected ConcurrentHashMap<SocketWrapper<Socket>, Http11Processor>
connections =
+ new ConcurrentHashMap<SocketWrapper<Socket>, Http11Processor>();
protected ConcurrentLinkedQueue<Http11Processor> recycledProcessors =
new ConcurrentLinkedQueue<Http11Processor>() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=934223&r1=934222&r2=934223&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Wed Apr 14
22:24:17 2010
@@ -144,9 +144,10 @@ public class JIoEndpoint extends Abstrac
// Ignore
}
long now = System.currentTimeMillis();
- Iterator<SocketWrapper> sockets = waitingRequests.iterator();
+ Iterator<SocketWrapper<Socket>> sockets =
+ waitingRequests.iterator();
while (sockets.hasNext()) {
- SocketWrapper socket = sockets.next();
+ SocketWrapper<Socket> socket = sockets.next();
long access = socket.getLastAccess();
if ((now-access)>socket.getTimeout()) {
processSocket(socket,SocketStatus.TIMEOUT);
@@ -538,7 +539,8 @@ public class JIoEndpoint extends Abstrac
return true;
}
- protected ConcurrentLinkedQueue<SocketWrapper> waitingRequests = new
ConcurrentLinkedQueue<SocketWrapper>();
+ protected ConcurrentLinkedQueue<SocketWrapper<Socket>> waitingRequests =
+ new ConcurrentLinkedQueue<SocketWrapper<Socket>>();
private static class PrivilegedSetTccl
implements PrivilegedAction<Void> {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
