Author: robbie
Date: Wed Apr 11 08:53:33 2012
New Revision: 1324648
URL: http://svn.apache.org/viewvc?rev=1324648&view=rev
Log:
QPID-3905: NullPointerException is thrown on rejecting messages whilst closing
the connection
merged from trunk r1304970
Modified:
qpid/branches/0.16/qpid/java/ (props changed)
qpid/branches/0.16/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Propchange: qpid/branches/0.16/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1304970
Modified:
qpid/branches/0.16/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.16/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=1324648&r1=1324647&r2=1324648&view=diff
==============================================================================
---
qpid/branches/0.16/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
(original)
+++
qpid/branches/0.16/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Wed Apr 11 08:53:33 2012
@@ -3208,11 +3208,11 @@ public abstract class AMQSession<C exten
{
synchronized (_lock)
{
- boolean stopped = _dispatcher.connectionStopped();
+ boolean stopped = connectionStopped();
if (!stopped)
{
- _dispatcher.setConnectionStopped(true);
+ setConnectionStopped(true);
}
// Reject messages on pre-receive queue
@@ -3225,7 +3225,7 @@ public abstract class AMQSession<C exten
// closeConsumer
consumer.markClosed();
- _dispatcher.setConnectionStopped(stopped);
+ setConnectionStopped(stopped);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
