qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject svn commit: r1063328 - in /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server: subscription/Subscription_0_10.java transport/ServerSessionDelegate.java
Date Tue, 25 Jan 2011 15:55:32 GMT
Author: robbie
Date: Tue Jan 25 15:55:31 2011
New Revision: 1063328

URL: http://svn.apache.org/viewvc?rev=1063328&view=rev
Log:
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

Modified:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java?rev=1063328&r1=1063327&r2=1063328&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
Tue Jan 25 15:55:31 2011
@@ -36,6 +36,7 @@ import org.apache.qpid.server.flow.Windo
 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 implement
         _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));
         }
  

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java?rev=1063328&r1=1063327&r2=1063328&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
Tue Jan 25 15:55:31 2011
@@ -253,8 +253,6 @@ public class ServerSessionDelegate exten
                                                                   filterManager,
                                                                   method.getArguments());
 
-                    CurrentActor.set(GenericActor.getInstance(sub));
-
                     ((ServerSession)session).register(destination, sub);
                     try
                     {



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message