Author: rgodfrey
Date: Mon Feb 10 09:33:50 2014
New Revision: 1566543
URL: http://svn.apache.org/r1566543
Log:
QPID-5504 : allow for case where consumer target is closed before consumer is attached
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java?rev=1566543&r1=1566542&r2=1566543&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java Mon Feb 10 09:33:50 2014
@@ -107,7 +107,11 @@ public class ConsumerTarget_0_10 extends
boolean closed = false;
State state = getState();
- getConsumer().getSendLock();
+ final Consumer consumer = getConsumer();
+ if(consumer != null)
+ {
+ consumer.getSendLock();
+ }
try
{
while(!closed && state != State.CLOSED)
@@ -122,7 +126,10 @@ public class ConsumerTarget_0_10 extends
}
finally
{
- getConsumer().releaseSendLock();
+ if(consumer != null)
+ {
+ consumer.releaseSendLock();
+ }
}
return closed;
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java?rev=1566543&r1=1566542&r2=1566543&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java Mon Feb 10 09:33:50 2014
@@ -428,7 +428,12 @@ public abstract class ConsumerTarget_0_8
boolean closed = false;
State state = getState();
- getConsumer().getSendLock();
+ final Consumer consumer = getConsumer();
+
+ if(consumer != null)
+ {
+ consumer.getSendLock();
+ }
try
{
while(!closed && state != State.CLOSED)
@@ -444,7 +449,10 @@ public abstract class ConsumerTarget_0_8
}
finally
{
- getConsumer().releaseSendLock();
+ if(consumer != null)
+ {
+ consumer.releaseSendLock();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org