diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-01-25 15:55:31 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-01-25 15:55:31 +0000 |
| commit | 1854199d60a0517cf99eab294b488f3eb89f4bc8 (patch) | |
| tree | df5e2bfcd1f219bc54f4faa9694b334bebce46fa | |
| parent | 709139f2271e33951af3d6b04f9c947249f5cc0c (diff) | |
| download | qpid-python-1854199d60a0517cf99eab294b488f3eb89f4bc8.tar.gz | |
QPID-3020: fix _logActor variable shadowing, use CurrentActor to log Sub creation, dont put the created Sub actor onto the stack as the SubFlushRunner does this already when required
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1063328 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 6 insertions, 6 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java index 0e19b17a50..b36ac84cdd 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java @@ -36,6 +36,7 @@ import org.apache.qpid.server.flow.WindowCreditManager; import org.apache.qpid.server.flow.FlowCreditManager_0_10; import org.apache.qpid.server.filter.FilterManager; import org.apache.qpid.server.logging.actors.CurrentActor; +import org.apache.qpid.server.logging.actors.GenericActor; import org.apache.qpid.server.logging.messages.SubscriptionMessages; import org.apache.qpid.server.logging.LogActor; import org.apache.qpid.server.logging.LogSubject; @@ -179,12 +180,13 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr _trace = (String) arguments.get("qpid.trace.id"); _id = getConfigStore().createId(); getConfigStore().addConfiguredObject(this); - String filterLogString = null; - LogActor _logActor = CurrentActor.get(); - if (_logActor.getRootMessageLogger().isMessageEnabled(_logActor, this, SubscriptionMessages.CREATE_LOG_HIERARCHY)) + String filterLogString = null; + + _logActor = GenericActor.getInstance(this); + if (CurrentActor.get().getRootMessageLogger().isMessageEnabled(_logActor, this, SubscriptionMessages.CREATE_LOG_HIERARCHY)) { filterLogString = getFilterLogString(); - _logActor.message(SubscriptionMessages.CREATE(filterLogString, queue.isDurable() && exclusive, + CurrentActor.get().message(this, SubscriptionMessages.CREATE(filterLogString, queue.isDurable() && exclusive, filterLogString.length() > 0)); } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java index 7715f70f0d..17d7dc90e3 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java @@ -253,8 +253,6 @@ public class ServerSessionDelegate extends SessionDelegate filterManager, method.getArguments()); - CurrentActor.set(GenericActor.getInstance(sub)); - ((ServerSession)session).register(destination, sub); try { |