From 9c840bdeb8107ce1570c3f5d7cabd6edb37356b0 Mon Sep 17 00:00:00 2001
From: jbertram <jbertram@apache.org>
Date: Tue, 26 Apr 2016 09:59:43 -0500
Subject: [PATCH] ARTEMIS-459 NPE during RA tearDown

---
 .../activemq/artemis/ra/inflow/ActiveMQActivation.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
index f42db64589..510e6803c6 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
@@ -42,6 +42,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
 import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
 import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
 import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.core.client.ClientSession;
 import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
 import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener;
@@ -360,6 +361,8 @@ public class ActiveMQActivation {
    protected synchronized void teardown() {
       ActiveMQRALogger.LOGGER.debug("Tearing down " + spec);
 
+      long timeout = factory == null ? ActiveMQClient.DEFAULT_CALL_TIMEOUT : factory.getCallTimeout();
+
       if (resourceRecovery != null) {
          ra.getRecoveryManager().unRegister(resourceRecovery);
       }
@@ -385,7 +388,7 @@ public class ActiveMQActivation {
       }
 
       //wait for all the consumers to complete any onmessage calls
-      boolean stuckThreads = !future.await(factory.getCallTimeout());
+      boolean stuckThreads = !future.await(timeout);
       //if any are stuck then we need to interrupt them
       if (stuckThreads) {
          for (Thread interruptThread : interruptThreads) {
@@ -413,7 +416,7 @@ public class ActiveMQActivation {
       threadTearDown.start();
 
       try {
-         threadTearDown.join(factory.getCallTimeout());
+         threadTearDown.join(timeout);
       }
       catch (InterruptedException e) {
          // nothing to be done on this context.. we will just keep going as we need to send an interrupt to threadTearDown and give up