remove NPE by always calling getChannel().getServerAdaptor(). Solves f…

…usesource#10
zapodot · Apr 25, 2013 · 183138d · 183138d
1 parent d2995dd
commit 183138d
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/stompjms-client/src/main/java/org/fusesource/stomp/jms/StompJmsSession.java b/stompjms-client/src/main/java/org/fusesource/stomp/jms/StompJmsSession.java
@@ -23,7 +23,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -52,7 +51,6 @@ public class StompJmsSession implements Session, QueueSession, TopicSession, Sto
     LinkedBlockingQueue<StompJmsMessage> stoppedMessages = new LinkedBlockingQueue<StompJmsMessage>(10000);
     StompChannel channel;
     StompJmsPrefetch prefetch;
-    StompServerAdaptor serverAdaptor;
 
     /**
      * Constructor
@@ -565,7 +563,7 @@ public Queue createQueue(String queueName) throws JMSException {
      */
     public TemporaryQueue createTemporaryQueue() throws JMSException {
         checkClosed();
-        return serverAdaptor.createTemporaryQueue(this);
+        return getChannel().getServerAdaptor().createTemporaryQueue(this);
     }
 
     /**
@@ -575,7 +573,7 @@ public TemporaryQueue createTemporaryQueue() throws JMSException {
      */
     public TemporaryTopic createTemporaryTopic() throws JMSException {
         checkClosed();
-        return serverAdaptor.createTemporaryTopic(this);
+        return getChannel().getServerAdaptor().createTemporaryTopic(this);
     }
 
     /**
@@ -773,7 +771,6 @@ protected void start() throws JMSException {
     protected StompChannel getChannel() throws JMSException {
         if(this.channel == null) {
             this.channel = this.connection.createChannel(this);
-            this.serverAdaptor = this.channel.getServerAdaptor();
         }
         return this.channel;
     }