From 4d1a176784e1c5fd3f5302fb9371a42947e4c736 Mon Sep 17 00:00:00 2001
From: Robert Davies <rajdavies@apache.org>
Date: Fri, 15 Jun 2007 10:24:23 +0000
Subject: [PATCH] synchronized activate () and add() methods

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@547601 13f79535-47bb-0310-9956-ffa450edef68
---
 .../broker/region/DurableTopicSubscription.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
index fa7cdb5272..1a3260ecda 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
@@ -74,8 +74,8 @@ public class DurableTopicSubscription extends PrefetchSubscription implements Us
         dispatchMatched();
     }
 
-    public void activate(UsageManager memoryManager,ConnectionContext context,ConsumerInfo info) throws Exception{
-        log.debug("Deactivating "+this);
+    public synchronized void activate(UsageManager memoryManager,ConnectionContext context,ConsumerInfo info) throws Exception{
+        log.debug("Activating "+this);
         if(!active){
             this.active=true;
             this.context=context;
@@ -85,11 +85,10 @@ public class DurableTopicSubscription extends PrefetchSubscription implements Us
                     Topic topic=(Topic)iter.next();
                     topic.activate(context,this);
                 }
-            }
-            synchronized(pending){
-                pending.setUsageManager(memoryManager);
-                pending.start();
-            }
+            }           
+            pending.setUsageManager(memoryManager);
+            pending.start();
+           
             // If nothing was in the persistent store, then try to use the recovery policy.
             if(pending.isEmpty()){
                 for(Iterator iter=destinations.values().iterator();iter.hasNext();){
@@ -160,7 +159,7 @@ public class DurableTopicSubscription extends PrefetchSubscription implements Us
         return md;
     }
 
-    public void add(MessageReference node) throws Exception{
+    public synchronized void add(MessageReference node) throws Exception{
         if(!active&&!keepDurableSubsActive){
             return;
         }
@@ -189,7 +188,7 @@ public class DurableTopicSubscription extends PrefetchSubscription implements Us
         return active;
     }
 
-    protected void acknowledge(ConnectionContext context,MessageAck ack,MessageReference node) throws IOException{
+    protected synchronized void acknowledge(ConnectionContext context,MessageAck ack,MessageReference node) throws IOException{
         node.getRegionDestination().acknowledge(context,this,ack,node);
         redeliveredMessages.remove(node.getMessageId());
         node.decrementReferenceCount();