You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/02/05 02:21:43 UTC
svn commit: r1564601 - in
/qpid/branches/java-broker-amqp-1-0-management/java:
broker-core/src/main/java/org/apache/qpid/server/queue/
broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/
Author: rgodfrey
Date: Wed Feb 5 01:21:43 2014
New Revision: 1564601
URL: http://svn.apache.org/r1564601
Log:
remove queue reference from SubscriptionTarget_v0_10
Modified:
qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SubscriptionTarget_0_10.java
Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=1564601&r1=1564600&r2=1564601&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Wed Feb 5 01:21:43 2014
@@ -478,7 +478,7 @@ public class SimpleAMQQueue implements A
throw new NullPointerException("subscription argument is null");
}
- boolean removed = _subscriptionList.remove((QueueSubscription)subscription);
+ boolean removed = _subscriptionList.remove(subscription);
if (removed)
{
@@ -487,10 +487,14 @@ public class SimpleAMQQueue implements A
setExclusiveSubscriber(null);
subscription.setQueueContext(null);
+ if(!isDeleted() && isExclusive() && getConsumerCount() == 0)
+ {
+ setAuthorizationHolder(null);
+ }
if(_messageGroupManager != null)
{
- resetSubPointersForGroups((QueueSubscription)subscription, true);
+ resetSubPointersForGroups(subscription, true);
}
synchronized (_subscriptionListeners)
Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java?rev=1564601&r1=1564600&r2=1564601&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java Wed Feb 5 01:21:43 2014
@@ -262,8 +262,8 @@ public class ServerSessionDelegate exten
method.getAcquireMode(),
MessageFlowMode.WINDOW,
creditManager,
- method.getArguments(),
- queue);
+ method.getArguments()
+ );
((ServerSession)session).register(destination, target);
try
@@ -413,12 +413,7 @@ public class ServerSessionDelegate exten
}
else
{
- AMQQueue queue = sub.getQueue();
((ServerSession)session).unregister(sub);
- if(!queue.isDeleted() && queue.isExclusive() && queue.getConsumerCount() == 0)
- {
- queue.setAuthorizationHolder(null);
- }
}
}
Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SubscriptionTarget_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SubscriptionTarget_0_10.java?rev=1564601&r1=1564600&r2=1564601&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SubscriptionTarget_0_10.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SubscriptionTarget_0_10.java Wed Feb 5 01:21:43 2014
@@ -52,7 +52,6 @@ public class SubscriptionTarget_0_10 ext
private static final Option[] BATCHED = new Option[] { Option.BATCH };
private final AtomicBoolean _deleted = new AtomicBoolean(false);
- private final AMQQueue _queue;
private final String _name;
@@ -63,7 +62,6 @@ public class SubscriptionTarget_0_10 ext
private MessageFlowMode _flowMode;
private final ServerSession _session;
private final AtomicBoolean _stopped = new AtomicBoolean(true);
- private static final Struct[] EMPTY_STRUCT_ARRAY = new Struct[0];
private final AtomicLong _unacknowledgedCount = new AtomicLong(0);
private final AtomicLong _unacknowledgedBytes = new AtomicLong(0);
@@ -80,7 +78,7 @@ public class SubscriptionTarget_0_10 ext
MessageAcquireMode acquireMode,
MessageFlowMode flowMode,
FlowCreditManager_0_10 creditManager,
- Map<String, Object> arguments, final AMQQueue queue)
+ Map<String, Object> arguments)
{
super(State.SUSPENDED);
_session = session;
@@ -93,13 +91,6 @@ public class SubscriptionTarget_0_10 ext
_arguments = arguments == null ? Collections.<String, Object> emptyMap() :
Collections.<String, Object> unmodifiableMap(arguments);
_name = name;
- _queue = queue;
-
- }
-
- public AMQQueue getQueue()
- {
- return _queue;
}
public Subscription getSubscription()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org