http://issues.apache.org/activemq/browse/AMQ-714

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@413674 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java

@@ -34,6 +34,12 @@ public class FixedCountSubscriptionRecoveryPolicy implements SubscriptionRecover
     volatile private MessageReference messages[];
     private int maximumSize=100;
     private int tail=0;
+    
+    public SubscriptionRecoveryPolicy copy() {
+        FixedCountSubscriptionRecoveryPolicy rc = new  FixedCountSubscriptionRecoveryPolicy();
+        rc.setMaximumSize(maximumSize);
+        return rc;
+    }
 
     synchronized public boolean add(ConnectionContext context,MessageReference node) throws Exception{
         messages[tail++]=node;
@@ -109,4 +115,5 @@ public class FixedCountSubscriptionRecoveryPolicy implements SubscriptionRecover
         }
         return (Message[]) result.toArray(new Message[result.size()]);
     }
+
 }

activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java

@@ -48,6 +48,13 @@ public class FixedSizedSubscriptionRecoveryPolicy implements SubscriptionRecover
     private int maximumSize = 100 * 64 * 1024;
     private boolean useSharedBuffer = true;
 
+    public SubscriptionRecoveryPolicy copy() {
+        FixedSizedSubscriptionRecoveryPolicy rc = new FixedSizedSubscriptionRecoveryPolicy();
+        rc.setMaximumSize(maximumSize);
+        rc.setUseSharedBuffer(useSharedBuffer);
+        return rc;
+    }
+
     public boolean add(ConnectionContext context, MessageReference message) throws Exception {
         buffer.add(message);
         return true;
@@ -125,4 +132,5 @@ public class FixedSizedSubscriptionRecoveryPolicy implements SubscriptionRecover
             return new DestinationBasedMessageList(maximumSize);
         }
     }
+
 }

activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java

@@ -18,6 +18,7 @@ package org.apache.activemq.broker.region.policy;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.broker.region.MessageReference;
 import org.apache.activemq.broker.region.Subscription;
@@ -76,4 +77,8 @@ public class LastImageSubscriptionRecoveryPolicy implements SubscriptionRecovery
         return (Message[])result.toArray(new Message[result.size()]);
     }
 
+    public SubscriptionRecoveryPolicy copy() {
+        return new LastImageSubscriptionRecoveryPolicy();
+    }
+
 }

activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java

@@ -32,6 +32,12 @@ import org.apache.activemq.command.Message;
  */
 public class NoSubscriptionRecoveryPolicy implements SubscriptionRecoveryPolicy {
 
+
+    public SubscriptionRecoveryPolicy copy() {
+        // This object is immutable
+        return this;
+    }
+
     public boolean add(ConnectionContext context, MessageReference node) throws Exception {
         return true;
     }

activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java

@@ -65,7 +65,7 @@ public class PolicyEntry extends DestinationMapEntry {
             topic.setDeadLetterStrategy(deadLetterStrategy);
         }
         if (subscriptionRecoveryPolicy != null) {
-            topic.setSubscriptionRecoveryPolicy(subscriptionRecoveryPolicy);
+            topic.setSubscriptionRecoveryPolicy(subscriptionRecoveryPolicy.copy());
         }
         topic.setSendAdvisoryIfNoConsumers(sendAdvisoryIfNoConsumers);
         if( memoryLimit>0 ) {

activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java

@@ -55,7 +55,10 @@ public class QueryBasedSubscriptionRecoveryPolicy implements SubscriptionRecover
     private IdGenerator idGenerator = new IdGenerator();
     private ProducerId producerId = createProducerId();
 
-    public QueryBasedSubscriptionRecoveryPolicy() {
+    public SubscriptionRecoveryPolicy copy() {
+        QueryBasedSubscriptionRecoveryPolicy rc = new QueryBasedSubscriptionRecoveryPolicy();
+        rc.setQuery(query);
+        return rc;
     }
 
     public boolean add(ConnectionContext context, MessageReference message) throws Exception {

activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java

@@ -64,4 +64,8 @@ public interface SubscriptionRecoveryPolicy extends Service {
      */
     Message[] browse(ActiveMQDestination dest) throws Exception;
 
+    /**
+     * Used to copy the policy object.
+     */
+    SubscriptionRecoveryPolicy copy();
 }

activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java

@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.broker.region.MessageReference;
 import org.apache.activemq.broker.region.Subscription;
@@ -67,6 +68,12 @@ public class TimedSubscriptionRecoveryPolicy implements SubscriptionRecoveryPoli
         }
     };
 
+    public SubscriptionRecoveryPolicy copy() {
+        TimedSubscriptionRecoveryPolicy rc = new TimedSubscriptionRecoveryPolicy();
+        rc.setRecoverDuration(recoverDuration);
+        return rc;
+    }
+
     public boolean add(ConnectionContext context, MessageReference message) throws Exception {
         buffer.add(new TimestampWrapper(message, lastGCRun));
         return true;