QPID-831 fix compile errors

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/thegreatmerge@649141 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 8 insertions, 69 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 8abe38dbe2..d91dac0949 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -854,7 +854,8 @@ public abstract class AMQSession extends Closeable implements Session, QueueSess
 
 
                 if (consumer.isAutoClose())
-                {     // There is a small window where the message is between the two queues in the dispatcher.
+                {     
+                    // There is a small window where the message is between the two queues in the dispatcher.
                     if (consumer.isClosed())
                     {
                         if (_logger.isInfoEnabled())
@@ -863,11 +864,6 @@ public abstract class AMQSession extends Closeable implements Session, QueueSess
                         }
 
                         deregisterConsumer(consumer);
-
-                    }
-                    else
-                    {
-                        _queue.add(new UnprocessedMessage.CloseConsumerMessage(consumer));
                     }
                 }
             }
@@ -2957,8 +2953,7 @@ public abstract class AMQSession extends Closeable implements Session, QueueSess
                                 dispatchMessage(message);
                             }
 
-                            if (!(message instanceof UnprocessedMessage.CloseConsumerMessage)
-                                && (message.getDeliverBody().getDeliveryTag() <= _rollbackMark.get()))
+                            if (message.getDeliveryTag() <= _rollbackMark.get())
                             {
                                 rejectMessage(message, true);
                             }
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
index 34af88b1ab..c35450c065 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
@@ -455,20 +455,6 @@ public abstract class BasicMessageConsumer<H, B> extends Closeable implements Me
          return o;
      }
 
-    private boolean closeOnAutoClose() throws JMSException
-    {
-        if (isAutoClose() && _closeWhenNoMessages && _synchronousQueue.isEmpty())
-        {
-            close(false);
-
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
     public Message receiveNoWait() throws JMSException
     {
         checkPreConditions();
@@ -541,12 +527,6 @@ public abstract class BasicMessageConsumer<H, B> extends Closeable implements Me
 
             throw e;
         }
-        else if (o instanceof UnprocessedMessage.CloseConsumerMessage)
-        {
-            _closed.set(true);
-            deregisterConsumer();
-            return null;
-        }
         else
         {
             return (AbstractJMSMessage) o;
@@ -670,12 +650,6 @@ public abstract class BasicMessageConsumer<H, B> extends Closeable implements Me
      */
     void notifyMessage(UnprocessedMessage messageFrame)
     {
-        if (messageFrame instanceof UnprocessedMessage.CloseConsumerMessage)
-        {
-            notifyCloseMessage((UnprocessedMessage.CloseConsumerMessage) messageFrame);
-            return;
-        }
-
         final boolean debug = _logger.isDebugEnabled();
 
         if (debug)
@@ -725,32 +699,6 @@ public abstract class BasicMessageConsumer<H, B> extends Closeable implements Me
     public abstract AbstractJMSMessage createJMSMessageFromUnprocessedMessage(UnprocessedMessage<H, B> messageFrame)
             throws Exception;
 
-
-    /** @param closeMessage this message signals that we should close the browser */
-    public void notifyCloseMessage(UnprocessedMessage.CloseConsumerMessage closeMessage)
-    {
-        if (isMessageListenerSet())
-        {
-            // Currently only possible to get this msg type with a browser.
-            // If we get the message here then we should probably just close this consumer.
-            // Though an AutoClose consumer with message listener is quite odd...
-            // Just log out the fact so we know where we are
-            _logger.warn("Using an AutoCloseconsumer with message listener is not supported.");
-        }
-        else
-        {
-            try
-            {
-                _synchronousQueue.put(closeMessage);
-            }
-            catch (InterruptedException e)
-            {
-                _logger.info(" SynchronousQueue.put interupted. Usually result of connection closing," +
-                             "but we shouldn't have close yet");
-            }
-        }
-    }
-
     /** @param jmsMessage this message has already been processed so can't redo preDeliver */
     public void notifyMessage(AbstractJMSMessage jmsMessage)
     {
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
index 895fd66fa1..a871c754b5 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
@@ -340,15 +340,11 @@ public class TransportConnection
         VmPipeAddress pipe = (VmPipeAddress) _inVmPipeAddress.get(port);
         if (pipe != null)
         {
-            VmPipeAddress pipe = (VmPipeAddress) _inVmPipeAddress.get(port);
-            if (pipe != null)
-            {
-                _logger.info("Killing VM Broker:" + port);
-                _inVmPipeAddress.remove(port);
-                // This does need to be sychronized as otherwise mina can hang
-                // if a new connection is made
-                _acceptor.unbind(pipe);
-            }
+            _logger.info("Killing VM Broker:" + port);
+            _inVmPipeAddress.remove(port);
+            // This does need to be sychronized as otherwise mina can hang
+            // if a new connection is made
+            _acceptor.unbind(pipe);
         }
     }