Index: ../../fuse/_repos/fuse_repos_github/activemq_RH_pgfox/activemq-runtime-config/src/test/java/org/apache/activemq/VirtualDestTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ../../fuse/_repos/fuse_repos_github/activemq_RH_pgfox/activemq-runtime-config/src/test/java/org/apache/activemq/VirtualDestTest.java	(date 1396544649000)
+++ ../../fuse/_repos/fuse_repos_github/activemq_RH_pgfox/activemq-runtime-config/src/test/java/org/apache/activemq/VirtualDestTest.java	(revision )
@@ -22,9 +22,13 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 import org.apache.activemq.broker.region.DestinationInterceptor;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.virtual.VirtualDestinationInterceptor;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.util.Wait;
 import org.junit.Test;
+import static org.junit.Assert.assertFalse;
 
 
 import static org.junit.Assert.*;
@@ -92,6 +96,28 @@
         exerciseCompositeQueue("VirtualDestination.CompositeQueue", "VirtualDestination.QueueConsumer");
 
         exerciseCompositeQueue("VirtualDestination.CompositeQueue", "VirtualDestination.CompositeQueue");
+    }
+
+    @Test
+    public void testModPolicy() throws Exception {
+        final String brokerConfig = configurationSeed + "-mod-policy-vd-broker";
+        applyNewConfig(brokerConfig, configurationSeed + "-mod-policy-vd-start", SLEEP);
+
+        startBroker(brokerConfig);
+        assertTrue("broker alive", brokerService.isStarted());
+
+        exerciseVirtualTopic("A.Default");
+
+        applyNewConfig(brokerConfig, configurationSeed + "-mod-policy-vd", SLEEP);
+
+        exerciseVirtualTopic("A.Default");
+
+
+        ActiveMQQueue dest = new ActiveMQQueue("ActiveMQ.DLQ");
+        PolicyEntry dlqEntry = brokerService.getDestinationPolicy().getEntryFor(dest);
+        assertTrue("ActiveMQ.DLQ process expire should now be false",
+                dlqEntry.isProducerFlowControl());
+
     }
 
     @Test
Index: ../../fuse/_repos/fuse_repos_github/activemq_RH_pgfox/activemq-runtime-config/src/test/resources/org/apache/activemq/virtualDestTest-mod-policy-vd-start.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ../../fuse/_repos/fuse_repos_github/activemq_RH_pgfox/activemq-runtime-config/src/test/resources/org/apache/activemq/virtualDestTest-mod-policy-vd-start.xml	(revision )
+++ ../../fuse/_repos/fuse_repos_github/activemq_RH_pgfox/activemq-runtime-config/src/test/resources/org/apache/activemq/virtualDestTest-mod-policy-vd-start.xml	(revision )
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+
+  <broker xmlns="http://activemq.apache.org/schema/core" start="false" persistent="false" >
+    <plugins>
+      <runtimeConfigurationPlugin checkPeriod="1000"/>
+    </plugins>
+
+      <destinationPolicy>
+          <policyMap>
+              <policyEntries>
+                  <policyEntry producerFlowControl="false" topic=">"/>
+                  <policyEntry lazyDispatch="false" optimizedDispatch="true" producerFlowControl="false" queue=">" />
+              </policyEntries>
+          </policyMap>
+      </destinationPolicy>
+
+    <destinationInterceptors>
+      <virtualDestinationInterceptor>
+        <virtualDestinations>
+          <virtualTopic name="A.>" selectorAware="false"/>
+        </virtualDestinations>
+      </virtualDestinationInterceptor>
+    </destinationInterceptors>
+  </broker>
+</beans>
Index: ../../fuse/_repos/fuse_repos_github/activemq_RH_pgfox/activemq-runtime-config/src/test/resources/org/apache/activemq/virtualDestTest-mod-policy-vd.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ../../fuse/_repos/fuse_repos_github/activemq_RH_pgfox/activemq-runtime-config/src/test/resources/org/apache/activemq/virtualDestTest-mod-policy-vd.xml	(revision )
+++ ../../fuse/_repos/fuse_repos_github/activemq_RH_pgfox/activemq-runtime-config/src/test/resources/org/apache/activemq/virtualDestTest-mod-policy-vd.xml	(revision )
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+
+  <broker xmlns="http://activemq.apache.org/schema/core" start="false" persistent="false" >
+    <plugins>
+      <runtimeConfigurationPlugin checkPeriod="1000"/>
+    </plugins>
+
+      <destinationPolicy>
+          <policyMap>
+              <policyEntries>
+                  <policyEntry queue="ActiveMQ.DLQ" producerFlowControl="true">
+                       <deadLetterStrategy>
+                           <individualDeadLetterStrategy processExpired="false"/>
+                       </deadLetterStrategy>
+                 </policyEntry>
+                  <policyEntry producerFlowControl="false" topic=">"/>
+                  <policyEntry lazyDispatch="false" optimizedDispatch="true" producerFlowControl="false" queue=">" />
+              </policyEntries>
+          </policyMap>
+      </destinationPolicy>
+
+    <destinationInterceptors>
+      <virtualDestinationInterceptor>
+        <virtualDestinations>
+          <virtualTopic name="A.>" selectorAware="false"/>
+        </virtualDestinations>
+      </virtualDestinationInterceptor>
+    </destinationInterceptors>
+  </broker>
+</beans>