diff options
| author | Greg Wilkins | 2016-02-01 16:18:42 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2016-02-01 16:18:42 +0000 |
| commit | 7ec6e2e899c5c9fa2aa136cb321892682fcba5dd (patch) | |
| tree | 09608e925431889791c5e825a54f79a6109f823d /jetty-util | |
| parent | c81dcfc79059b6e0a3a0bfd22cb5b5633dd3291b (diff) | |
| download | org.eclipse.jetty.project-7ec6e2e899c5c9fa2aa136cb321892682fcba5dd.tar.gz org.eclipse.jetty.project-7ec6e2e899c5c9fa2aa136cb321892682fcba5dd.tar.xz org.eclipse.jetty.project-7ec6e2e899c5c9fa2aa136cb321892682fcba5dd.zip | |
486930 - Selector does not correctly handle rejected execution exception
Improved comments and unit test
Diffstat (limited to 'jetty-util')
2 files changed, 3 insertions, 2 deletions
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ExecuteProduceConsume.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ExecuteProduceConsume.java index c3436ad35d..4643775e6a 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ExecuteProduceConsume.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ExecuteProduceConsume.java @@ -147,6 +147,7 @@ public class ExecuteProduceConsume implements ExecutionStrategy, Runnable } catch(Throwable e) { + // just warn if lowresources execute fails and keep producing LOG.warn(e); } } @@ -218,7 +219,7 @@ public class ExecuteProduceConsume implements ExecutionStrategy, Runnable } catch(RejectedExecutionException e) { - // If we cannot execute, the close or discard the task and keep producing + // If we cannot execute, then discard/reject the task and keep producing LOG.debug(e); LOG.warn("RejectedExecution {}",task); try diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceExecuteConsume.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceExecuteConsume.java index 6e7c95e571..9310c05d5f 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceExecuteConsume.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceExecuteConsume.java @@ -62,7 +62,7 @@ public class ProduceExecuteConsume implements ExecutionStrategy } catch(RejectedExecutionException e) { - // Close or discard tasks that cannot be executed + // Discard/reject tasks that cannot be executed if (task instanceof Rejectable) { try |