summaryrefslogtreecommitdiff
path: root/qpid/java/common/src/main
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2006-12-13 11:05:28 +0000
committerMartin Ritchie <ritchiem@apache.org>2006-12-13 11:05:28 +0000
commit242818f1f3d8daf18bd504f69d45f8b560ab7497 (patch)
tree6a74355fa453bfebe7e8228cb96ee1e84680166a /qpid/java/common/src/main
parent8b118d220e0248541efe26e8fe2d7fc0cf640dee (diff)
downloadqpid-python-242818f1f3d8daf18bd504f69d45f8b560ab7497.tar.gz
QPID-172
RejectedExecutionException. In fireEvent added additional checks :_poolReference.getPool() != null && !_poolReference.getPool().isShutdown() to if (job.activate()) As active jobs were being put on a pool that was shutdown. Included a test to check that the RejectedExecutionException doesn't occur. (add ignore for example/target) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@486596 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src/main')
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java b/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
index ba614a26c2..2ace2b8348 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
@@ -58,7 +58,7 @@ public class PoolingFilter extends IoFilterAdapter implements Job.JobCompletionH
Job job = getJobForSession(session);
job.acquire(); //prevents this job being removed from _jobs
job.add(event);
- if (job.activate())
+ if (job.activate() && _poolReference.getPool() != null && !_poolReference.getPool().isShutdown())
{
_poolReference.getPool().execute(job);
}