Author: markt
Date: Tue Sep 15 20:24:49 2015
New Revision: 1703287
URL: http://svn.apache.org/r1703287
Log:
Follow-up to r1703151
More clean-up and remove an unnecessary clear() that could cause problems.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1703287&r1=1703286&r2=1703287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Tue Sep 15 20:24:49 2015
@@ -145,9 +145,7 @@ public class NioReceiver extends Receive
public void addEvent(Runnable event) {
Selector selector = this.selector.get();
if (selector != null) {
- synchronized (events) {
- events.add(event);
- }
+ events.add(event);
if (log.isTraceEnabled()) {
log.trace("Adding event to selector:" + event);
}
@@ -158,22 +156,19 @@ public class NioReceiver extends Receive
}
public void events() {
- if (events.size() == 0) {
+ if (events.isEmpty()) {
return;
}
- synchronized (events) {
- Runnable r = null;
- while ((r = events.pollFirst()) != null ) {
- try {
- if (log.isTraceEnabled()) {
- log.trace("Processing event in selector:" + r);
- }
- r.run();
- } catch (Exception x) {
- log.error("", x);
+ Runnable r = null;
+ while ((r = events.pollFirst()) != null ) {
+ try {
+ if (log.isTraceEnabled()) {
+ log.trace("Processing event in selector:" + r);
}
+ r.run();
+ } catch (Exception x) {
+ log.error("", x);
}
- events.clear();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
