Author: markt
Date: Tue Sep 11 21:17:21 2012
New Revision: 1383615
URL: http://svn.apache.org/viewvc?rev=1383615&view=rev
Log:
Clean-up remove unnecessary code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/collections/ManagedConcurrentWeakHashMap.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/collections/ManagedConcurrentWeakHashMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/collections/ManagedConcurrentWeakHashMap.java?rev=1383615&r1=1383614&r2=1383615&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/collections/ManagedConcurrentWeakHashMap.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/collections/ManagedConcurrentWeakHashMap.java
Tue Sep 11 21:17:21 2012
@@ -243,9 +243,6 @@ public class ManagedConcurrentWeakHashMa
return new Map.Entry<K, V>() {
private final Map.Entry<Key, V> en = it.next();
- // Warning suppressed, because Key stored in the
map
- // always wraps a K
- @SuppressWarnings("unchecked")
@Override
public K getKey() {
return (K) en.getKey().get();
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=1383615&r1=1383614&r2=1383615&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Sep 11
21:17:21 2012
@@ -1433,7 +1433,7 @@ public class NioEndpoint extends Abstrac
cancelledKey(key, SocketStatus.ERROR);//TODO this is
not yet being used
} else if (ka.getCometNotify() ) {
ka.setCometNotify(false);
- int ops = ka.interestOps() & ~OP_CALLBACK;;
+ int ops = ka.interestOps() & ~OP_CALLBACK;
reg(key,ka,0);//avoid multiple calls, this gets
re-registered after invocation
ka.interestOps(ops);
if (!processSocket(ka.getChannel(),
SocketStatus.OPEN_READ, true)) processSocket(ka.getChannel(),
SocketStatus.DISCONNECT, true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
