Author: markt
Date: Wed Feb 8 08:53:22 2012
New Revision: 1241820
URL: http://svn.apache.org/viewvc?rev=1241820&view=rev
Log:
Fix some generics warnings
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1241820&r1=1241819&r2=1241820&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java Wed Feb
8 08:53:22 2012
@@ -42,7 +42,7 @@ public abstract class StreamInbound impl
// frames
// TODO
- private UpgradeProcessor processor = null;
+ private UpgradeProcessor<?> processor = null;
private WsOutbound outbound;
@Override
@@ -52,7 +52,7 @@ public abstract class StreamInbound impl
@Override
- public void setUpgradeProcessor(UpgradeProcessor processor) {
+ public void setUpgradeProcessor(UpgradeProcessor<?> processor) {
this.processor = processor;
}
Modified: tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java?rev=1241820&r1=1241819&r2=1241820&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java Wed Feb
8 08:53:22 2012
@@ -22,12 +22,12 @@ import org.apache.coyote.http11.upgrade.
public class WsInputStream extends java.io.InputStream {
- private UpgradeProcessor processor;
+ private UpgradeProcessor<?> processor;
private byte[] mask;
private long remaining;
private long read;
- public WsInputStream(UpgradeProcessor processor, byte[] mask,
+ public WsInputStream(UpgradeProcessor<?> processor, byte[] mask,
long remaining) {
this.processor = processor;
this.mask = mask;
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java?rev=1241820&r1=1241819&r2=1241820&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java Wed
Feb 8 08:53:22 2012
@@ -26,7 +26,7 @@ import org.apache.tomcat.util.net.Abstra
*/
public interface UpgradeInbound {
- void setUpgradeProcessor(UpgradeProcessor processor);
+ void setUpgradeProcessor(UpgradeProcessor<?> processor);
SocketState onData() throws IOException;
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java?rev=1241820&r1=1241819&r2=1241820&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java Wed
Feb 8 08:53:22 2012
@@ -32,9 +32,9 @@ public class UpgradeOutbound extends Out
processor.flush();
}
- private UpgradeProcessor processor;
+ private UpgradeProcessor<?> processor;
- public UpgradeOutbound(UpgradeProcessor processor) {
+ public UpgradeOutbound(UpgradeProcessor<?> processor) {
this.processor = processor;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
