https://issues.apache.org/jira/browse/AMQ-3622 - NPE in LastImageSubscriptionRecoveryPolicy. patch variant applied and nice test./bin/activemq console xbean:conf/limit.xml Thanks

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

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

@@ -59,9 +59,11 @@ public class LastImageSubscriptionRecoveryPolicy implements SubscriptionRecovery
 
     public Message[] browse(ActiveMQDestination destination) throws Exception {
         List<Message> result = new ArrayList<Message>();
-        DestinationFilter filter = DestinationFilter.parseFilter(destination);
-        if (filter.matches(lastImage.getMessage().getDestination())) {
-            result.add(lastImage.getMessage());
+        if (lastImage != null) {
+            DestinationFilter filter = DestinationFilter.parseFilter(destination);
+            if (filter.matches(lastImage.getMessage().getDestination())) {
+                result.add(lastImage.getMessage());
+            }
         }
         return result.toArray(new Message[result.size()]);
     }

activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3622Test.java

@@ -0,0 +1,108 @@
+/**
+ * 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.
+ */
+package org.apache.activemq.bugs;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.region.policy.FilePendingSubscriberMessageStoragePolicy;
+import org.apache.activemq.broker.region.policy.LastImageSubscriptionRecoveryPolicy;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.transport.stomp.Stomp;
+import org.apache.activemq.transport.stomp.StompConnection;
+import org.apache.activemq.util.DefaultTestAppender;
+import org.apache.log4j.Appender;
+import org.apache.log4j.Logger;
+import org.apache.log4j.spi.LoggingEvent;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.Assert.fail;
+
+public class AMQ3622Test {
+    
+    protected BrokerService broker;
+    protected AtomicBoolean failed = new AtomicBoolean(false);
+    protected String connectionUri;
+    protected Appender appender = new DefaultTestAppender() {
+
+        @Override
+        public void doAppend(LoggingEvent event) {
+            System.err.println(event.getMessage());
+            if (event.getThrowableInformation() != null) {
+                if (event.getThrowableInformation().getThrowable() instanceof NullPointerException) {
+                    failed.set(true);
+                }
+            }
+        }
+    };
+
+    @Before
+    public void before() throws Exception {
+        Logger.getRootLogger().addAppender(appender);
+
+        broker = new BrokerService();
+        broker.setDataDirectory("target" + File.separator + "activemq-data");
+        broker.setPersistent(true);
+        broker.setDeleteAllMessagesOnStartup(true);
+        PolicyEntry policy = new PolicyEntry();
+        policy.setTopic(">");
+        policy.setProducerFlowControl(false);
+        policy.setMemoryLimit(1 * 1024 * 1024);
+        policy.setPendingSubscriberPolicy(new FilePendingSubscriberMessageStoragePolicy());
+        policy.setSubscriptionRecoveryPolicy(new LastImageSubscriptionRecoveryPolicy());
+        policy.setExpireMessagesPeriod(500);
+        List<PolicyEntry> entries = new ArrayList<PolicyEntry>();
+        
+        entries.add(policy);
+        PolicyMap pMap = new PolicyMap();
+        pMap.setPolicyEntries(entries);
+        broker.setDestinationPolicy(pMap);
+
+        connectionUri = broker.addConnector("stomp://localhost:0").getPublishableConnectString();
+
+        broker.start();
+        broker.waitUntilStarted();
+    }
+
+    @After
+    public void after() throws Exception {
+        broker.stop();
+        broker.waitUntilStopped();
+        Logger.getRootLogger().removeAppender(appender);
+    }
+    
+    @Test
+    public void go() throws Exception {
+        StompConnection connection = new StompConnection();
+        connection.open("localhost", Integer.parseInt(connectionUri.replace("stomp://localhost:", "")));
+        connection.connect("", "");
+        connection.subscribe("/topic/foobar", Stomp.Headers.Subscribe.AckModeValues.CLIENT);
+        connection.disconnect();
+        Thread.sleep(1000);
+        
+        if (failed.get()) {
+            fail("Received NullPointerException");
+        }
+    }
+
+}