diff options
| author | Keith Wall <kwall@apache.org> | 2012-06-30 12:31:49 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2012-06-30 12:31:49 +0000 |
| commit | 74379046f7bd8a787c9c5f32df75f1ca2a39438a (patch) | |
| tree | c4510ad223f29cef5f6a2c7a69fc85aa20cb1e35 /qpid/java/broker/src/test | |
| parent | 9b2699d8a9b257e17d26495d19590f61d06c05c7 (diff) | |
| download | qpid-python-74379046f7bd8a787c9c5f32df75f1ca2a39438a.tar.gz | |
QPID-4902: NPE from SimpleAMQQueue and RejectedExecutionExecution handling
Guard against NPE in setLastSeenEntry. #execute() method change to ignore REE in the case where the
queue has already been stopped (logged at ERROR otherwise). Change Subscription*#_queueContext member
to volatile as this member is get/set from different threads during the queue's lifecycle
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1355721 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/test')
| -rw-r--r-- | qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java index 0aa0569b07..363eb5ecab 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java @@ -48,7 +48,7 @@ public class MockSubscription implements Subscription private AMQShortString tag = new AMQShortString("mocktag"); private AMQQueue queue = null; private StateListener _listener = null; - private AMQQueue.Context _queueContext = null; + private volatile AMQQueue.Context _queueContext = null; private State _state = State.ACTIVE; private ArrayList<QueueEntry> messages = new ArrayList<QueueEntry>(); private final Lock _stateChangeLock = new ReentrantLock(); |