Author: markt
Date: Mon Oct 6 12:10:06 2014
New Revision: 1629620
URL: http://svn.apache.org/r1629620
Log:
Remove workarounds for Java 5 bugs that do not impact Java 7 onwards.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
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=1629620&r1=1629619&r2=1629620&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Oct 6
12:10:06 2014
@@ -1062,16 +1062,6 @@ public class NioEndpoint extends Abstrac
}
break;
}
- } catch ( NullPointerException x ) {
- //sun bug 5076772 on windows JDK 1.5
- if ( log.isDebugEnabled() ) log.debug("Possibly
encountered sun bug 5076772 on windows JDK 1.5",x);
- if ( wakeupCounter == null || selector == null ) throw
x;
- continue;
- } catch ( CancelledKeyException x ) {
- //sun bug 5076772 on windows JDK 1.5
- if ( log.isDebugEnabled() ) log.debug("Possibly
encountered sun bug 5076772 on windows JDK 1.5",x);
- if ( wakeupCounter == null || selector == null ) throw
x;
- continue;
} catch (Throwable x) {
ExceptionUtils.handleThrowable(x);
log.error("",x);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
