svn commit: r1514778 - in /tomcat/trunk/java/org/apache/tomcat/websocket: AsyncChannelWrapper.java AsyncChannelWrapperNonSecure.java AsyncChannelWrapperSecure.java

[markt]

Author: markt
Date: Fri Aug 16 16:34:45 2013
New Revision: 1514778

URL: http://svn.apache.org/r1514778
Log:
Be a little more precise in the use of generics. Porting this to Tomcat 7 where 
<> is not allowed highlighted an issue.

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapper.java
    
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.java
    tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapper.java?rev=1514778&r1=1514777&r2=1514778&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapper.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapper.java Fri 
Aug 16 16:34:45 2013
@@ -32,14 +32,14 @@ public interface AsyncChannelWrapper {
 
     Future<Integer> read(ByteBuffer dst);
 
-    <A> void read(ByteBuffer dst, A attachment,
-            CompletionHandler<Integer,? super A> handler);
+    <B,A extends B> void read(ByteBuffer dst, A attachment,
+            CompletionHandler<Integer,B> handler);
 
     Future<Integer> write(ByteBuffer src);
 
-    <A> void write(ByteBuffer[] srcs, int offset, int length, long timeout,
-            TimeUnit unit, A attachment,
-            CompletionHandler<Long,? super A> handler);
+    <B,A extends B> void write(ByteBuffer[] srcs, int offset, int length,
+            long timeout, TimeUnit unit, A attachment,
+            CompletionHandler<Long,B> handler);
 
     void close();
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.java?rev=1514778&r1=1514777&r2=1514778&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.java 
Fri Aug 16 16:34:45 2013
@@ -47,8 +47,8 @@ public class AsyncChannelWrapperNonSecur
     }
 
     @Override
-    public <A> void read(ByteBuffer dst, A attachment,
-            CompletionHandler<Integer,? super A> handler) {
+    public <B,A extends B> void read(ByteBuffer dst, A attachment,
+            CompletionHandler<Integer,B> handler) {
         socketChannel.read(dst, attachment, handler);
     }
 
@@ -58,9 +58,9 @@ public class AsyncChannelWrapperNonSecur
     }
 
     @Override
-    public <A> void write(ByteBuffer[] srcs, int offset, int length,
+    public <B,A extends B> void write(ByteBuffer[] srcs, int offset, int 
length,
             long timeout, TimeUnit unit, A attachment,
-            CompletionHandler<Long,? super A> handler) {
+            CompletionHandler<Long,B> handler) {
         socketChannel.write(
                 srcs, offset, length, timeout, unit, attachment, handler);
     }

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java?rev=1514778&r1=1514777&r2=1514778&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java 
Fri Aug 16 16:34:45 2013
@@ -88,10 +88,10 @@ public class AsyncChannelWrapperSecure i
     }
 
     @Override
-    public <A> void read(ByteBuffer dst, A attachment,
-            CompletionHandler<Integer,? super A> handler) {
+    public <B,A extends B> void read(ByteBuffer dst, A attachment,
+            CompletionHandler<Integer,B> handler) {
 
-        WrapperFuture<Integer,? super A> future =
+        WrapperFuture<Integer,B> future =
                 new WrapperFuture<>(handler, attachment);
 
         if (!reading.compareAndSet(false, true)) {
@@ -124,11 +124,11 @@ public class AsyncChannelWrapperSecure i
     }
 
     @Override
-    public <A> void write(ByteBuffer[] srcs, int offset, int length,
+    public <B,A extends B> void write(ByteBuffer[] srcs, int offset, int 
length,
             long timeout, TimeUnit unit, A attachment,
-            CompletionHandler<Long,? super A> handler) {
+            CompletionHandler<Long,B> handler) {
 
-        WrapperFuture<Long,? super A> future =
+        WrapperFuture<Long,B> future =
                 new WrapperFuture<>(handler, attachment);
 
         if (!writing.compareAndSet(false, true)) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org