Merged revisions 598285,598619,598721,598834-598835,599375,599531,599533,599572,599805,602134,604151,604928,605536,605542,606015-606016 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1

........
  r598285 | ritchiem | 2007-11-26 14:16:01 +0000 (Mon, 26 Nov 2007) | 3 lines
  
  QPID-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all future versions currently have a bug with the CumulativeProtocolDecoder. It compact()s the buffer which breaks slices. Added MultiThread Support which is some of the feature set of QPID-564
........
  r598619 | ritchiem | 2007-11-27 12:51:14 +0000 (Tue, 27 Nov 2007) | 1 line
  
  Renamed POMs to M2.1.1 Removed erroneous equals() in SpecificMethodFrameListenerTest
........
  r598721 | ritchiem | 2007-11-27 18:09:33 +0000 (Tue, 27 Nov 2007) | 1 line
  
  QPID-621 : Patch Supplied by Aidan Skinner. Msg Ack after msg consumer is closed.
........
  r598834 | ritchiem | 2007-11-28 00:45:32 +0000 (Wed, 28 Nov 2007) | 14 lines
  
  QPID-679 : Patch provided by Aidan Skinner and additional from odd problems during test runs.
  AMQChannel - Catch and log AMQException occuring when requeue()-ing. Previously exceptions wouldn't be caught at all. The requeue() is called during closure so there is nothing we can do protocol wise on error other than log the issue and continue with any other shutdown that is needed.
  AMQMinaProtocolSession & AMQPFastProtocolHandler . Additions to catch and log AMQExceptions. Changes to AMQMinaProtocolSession were done to ignore all input on a closing session other than the close-ok. Previously only Protocol frames were ignored this resulted in Content*Body-s still being processed. Additional checks were made for the MessageStoreClosedException to log and continue. As said else were we need to seperate protocol exceptoions(AMQException) from internal code exception handling. Further All AMQExceptions occuring in the frameReceived method are now caught and logged. Allowing them to propogate higher will only result in thread death.
  AMQPFastProtocolHandler Caught AMQExceptions occuring whilst closing the session. Again allowing these to continue will result in thread death. There is not a lot that can be done other than log the problem as the session is already closed by this point. Prevented the stacktrace associated with a session exception being printed in the exceptionCaught method when the problem was an IO Exception. This doesn't add anything useful and only adds to the log file sizes.
  ApplicationRegistry - Added removeAll option which ensures that all ARs are correctly purged so that we can attempt to clean up between Unit Tests.
  MemoryMessageStore - This was causing us real problems during the failover testing. Similar checks should probably be made to any other Message Store Impl. The issue was that when shutting down the broker the MS.close() method is called this sets all the storage to null. However, there may still be message processing going on as the close() does not attempt to stop connection processing. Hence we now check to see if the Store is close throwing a MSClosedException if required. This prevents NPEs that have been seen during Unit failover testing. In fact the close() is called as a request to shutdown the ApplicationRegistry, but this only occurs from tests and broker shutdown, no attempt to unbind or prevent further connections during this period is yet done.
  
  CLIENT CHANGES
  AMQConnection - Added method to check if failover is in progress.
  AMQClient - Upgraded acknowledge() exception to JMSException for errors due to failover. Also , added call to update consumers as a result of failover.
  BasicMessageConsumer - Changes to acquireReceiving to take in to consideration blocking for failover to occur. wrt receiveNoWait.. which previously blocked for failover to complete... not exactly noWait. acknowledge will now
  TransportConnection - Update to ensure all inVM brokers are correctly killed.
  
  FailoverTest - QPID-679 - Finder of all the above problems.
........
  r598835 | ritchiem | 2007-11-28 01:01:05 +0000 (Wed, 28 Nov 2007) | 1 line
  
  CommitRollbackTest - this one just was never right.. now we have something better.
........
  r599375 | ritchiem | 2007-11-29 10:58:08 +0000 (Thu, 29 Nov 2007) | 1 line
  
  Update to broker to address fanout python failure.
........
  r599531 | ritchiem | 2007-11-29 17:56:12 +0000 (Thu, 29 Nov 2007) | 1 line
  
  QPID-92 QPID-564 Forgot to upgrade mina to 1.0.1
........
  r599533 | ritchiem | 2007-11-29 18:25:21 +0000 (Thu, 29 Nov 2007) | 1 line
  
  QPID-564 QPID-92 Tidied up a few points and fixed infinite loop in Read IO Thread
........
  r599572 | ritchiem | 2007-11-29 20:56:22 +0000 (Thu, 29 Nov 2007) | 2 lines
  
  Mina Fix: Vm Pipe Starts Connection session before acceptor session. This results in protocol frames arriving before the protocol decoder has been configured on the InVM Broker. Verification of this could be done by adding a client side filter that delays the first message by a few seconds.
........
  r599805 | ritchiem | 2007-11-30 12:47:08 +0000 (Fri, 30 Nov 2007) | 1 line
  
  Added new simple Request/Repsonse code as my last commit here seems to have missed the actual code.
........
  r602134 | rupertlssmith | 2007-12-07 16:00:14 +0000 (Fri, 07 Dec 2007) | 1 line
  
  Added JDNI config for two broker, failover setup for failover tests. Also passed into FT tests config.
........
  r604151 | ritchiem | 2007-12-14 10:40:37 +0000 (Fri, 14 Dec 2007) | 2 lines
  
  QPID-707 : Added new test to check message count on broker as messages are consumed to ensure that an ack is sent at 5000 mgs. Added acks on message consumer closure.
  Augmented VMTestCase to have helper methods for accessing broker statistics.
........
  r604928 | rupertlssmith | 2007-12-17 17:00:10 +0000 (Mon, 17 Dec 2007) | 1 line
  
  DUPS_OK mode set to be same as AUTO_ACK, fixed broken dups ok test.
........
  r605536 | rupertlssmith | 2007-12-19 13:40:05 +0000 (Wed, 19 Dec 2007) | 1 line
  
  Messages were being sent mandatory by default, set to false.
........
  r605542 | rupertlssmith | 2007-12-19 13:53:44 +0000 (Wed, 19 Dec 2007) | 1 line
  
  Changed test configs to use colons instead of commas.
........
  r606015 | rgodfrey | 2007-12-20 20:08:01 +0000 (Thu, 20 Dec 2007) | 2 lines
  
  QPID-714 : (Patch from Aidan Skinner) Issue with competing, transactional/client-ack consumers
  Ack each individual message on commit, not use multiple acks
........
  r606016 | rgodfrey | 2007-12-20 20:12:25 +0000 (Thu, 20 Dec 2007) | 2 lines
  
  QPID-714 : (Patch from Aidan Skinner) Issue with competing, transactional/client-ack consumers
  Ack each individual message on commit, not use multiple acks
........


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

6 files changed, 108 insertions, 48 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 9fb3a5040b..4696ec4453 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -226,7 +226,7 @@ public class AMQChannel
                 BasicContentHeaderProperties properties = (BasicContentHeaderProperties) contentHeaderBody.properties;
                 //fixme: fudge for QPID-677
                 properties.getHeaders().keySet();
-                
+
                 properties.setUserId(protocolSession.getAuthorizedID().getName());
             }
 
@@ -378,7 +378,14 @@ public class AMQChannel
     {
         _txnContext.rollback();
         unsubscribeAllConsumers(session);
-        requeue();
+        try
+        {
+            requeue();
+        }
+        catch (AMQException e)
+        {
+            _log.error("Caught AMQException whilst attempting to reque:" + e);        
+        }
 
         setClosing(true);
     }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
index 8ede553464..1a9dc6673a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
@@ -7,9 +7,9 @@
  * 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
@@ -53,7 +53,7 @@ public class DefaultExchangeFactory implements ExchangeFactory
     {
         _exchangeClassMap.put(type.getName(), type);
     }
-    
+
     public Collection<ExchangeType<? extends Exchange>> getRegisteredTypes()
     {
         return _exchangeClassMap.values();
@@ -75,6 +75,12 @@ public class DefaultExchangeFactory implements ExchangeFactory
 
     public void initialise(Configuration hostConfig)
     {
+
+        if (hostConfig == null)
+        {
+            return;
+        }
+
         for(Object className : hostConfig.getList("custom-exchanges.class-name"))
         {
             try
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
index fa9d83cd7e..543e043bed 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
@@ -165,7 +165,14 @@ public class AMQPFastProtocolHandler extends IoHandlerAdapter
         //fixme  -- this can be null
         if (amqProtocolSession != null)
         {
-            amqProtocolSession.closeSession();
+            try
+            {
+                amqProtocolSession.closeSession();
+            }
+            catch (AMQException e)
+            {
+                _logger.error("Caught AMQException whilst closingSession:" + e);
+            }
         }
     }
 
@@ -199,7 +206,7 @@ public class AMQPFastProtocolHandler extends IoHandlerAdapter
         }
         else if (throwable instanceof IOException)
         {
-            _logger.error("IOException caught in" + session + ", session closed implictly: " + throwable, throwable);
+            _logger.error("IOException caught in" + session + ", session closed implictly: " + throwable);
         }
         else
         {
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
index 22fa0fab23..455983c6d8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
@@ -7,9 +7,9 @@
  * 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
@@ -20,15 +20,14 @@
  */
 package org.apache.qpid.server.registry;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
 import org.apache.commons.configuration.Configuration;
 import org.apache.log4j.Logger;
 import org.apache.qpid.server.configuration.Configurator;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * An abstract application registry that provides access to configuration information and handles the
  * construction and caching of configurable objects.
@@ -59,24 +58,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
         public void run()
         {
             _logger.info("Shutting down application registries...");
-            try
-            {
-                synchronized (ApplicationRegistry.class)
-                {
-                    Iterator<IApplicationRegistry> keyIterator = _instanceMap.values().iterator();
-
-                    while (keyIterator.hasNext())
-                    {
-                        IApplicationRegistry instance = keyIterator.next();
-
-                        instance.close();
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                _logger.error("Error shutting down message store: " + e, e);
-            }
+            removeAll();
         }
     }
 
@@ -116,6 +98,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
         }
         catch (Exception e)
         {
+            _logger.error("Error shutting down message store: " + e, e);
 
         }
         finally
@@ -124,6 +107,14 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
         }
     }
 
+    public static void removeAll()
+    {
+        Object[] keys = _instanceMap.keySet().toArray();
+        for (Object k : keys)
+        {
+            remove((Integer) k);
+        }
+    }
 
     protected ApplicationRegistry(Configuration configuration)
     {
@@ -154,7 +145,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
                 catch (Exception e)
                 {
                     _logger.error("Error configuring application: " + e, e);
-                //throw new AMQBrokerCreationException(instanceID, "Unable to create Application Registry instance " + instanceID);
+                    //throw new AMQBrokerCreationException(instanceID, "Unable to create Application Registry instance " + instanceID);
                     throw new RuntimeException("Unable to create Application Registry", e);
                 }
             }
@@ -167,7 +158,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
 
     public void close() throws Exception
     {
-        for(VirtualHost virtualHost : getVirtualHostRegistry().getVirtualHosts())
+        for (VirtualHost virtualHost : getVirtualHostRegistry().getVirtualHosts())
         {
             virtualHost.close();
         }
@@ -204,7 +195,6 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
         return instance;
     }
 
-    
 
     public static void setDefaultApplicationRegistry(String clazz)
     {
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java b/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
index 8ccb0be0a8..7a6e0b011f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
@@ -20,27 +20,26 @@
  */
 package org.apache.qpid.server.store;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicLong;
-
 import org.apache.commons.configuration.Configuration;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.ContentChunk;
+import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MessageMetaData;
 import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.exchange.Exchange;
 
-/**
- * A simple message store that stores the messages in a threadsafe structure in memory.
- */
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+/** A simple message store that stores the messages in a threadsafe structure in memory. */
 public class MemoryMessageStore implements MessageStore
 {
     private static final Logger _log = Logger.getLogger(MemoryMessageStore.class);
@@ -54,6 +53,7 @@ public class MemoryMessageStore implements MessageStore
     protected ConcurrentMap<Long, List<ContentChunk>> _contentBodyMap;
 
     private final AtomicLong _messageId = new AtomicLong(1);
+    private AtomicBoolean _closed = new AtomicBoolean(false);
 
     public void configure()
     {
@@ -77,6 +77,7 @@ public class MemoryMessageStore implements MessageStore
 
     public void close() throws Exception
     {
+        _closed.getAndSet(true);
         if (_metaDataMap != null)
         {
             _metaDataMap.clear();
@@ -89,8 +90,9 @@ public class MemoryMessageStore implements MessageStore
         }
     }
 
-    public void removeMessage(StoreContext context, Long messageId)
+    public void removeMessage(StoreContext context, Long messageId) throws AMQException
     {
+        checkNotClosed();
         if (_log.isDebugEnabled())
         {
             _log.debug("Removing message with id " + messageId);
@@ -172,9 +174,10 @@ public class MemoryMessageStore implements MessageStore
     public void storeContentBodyChunk(StoreContext context, Long messageId, int index, ContentChunk contentBody, boolean lastContentBody)
             throws AMQException
     {
+        checkNotClosed();
         List<ContentChunk> bodyList = _contentBodyMap.get(messageId);
 
-        if(bodyList == null && lastContentBody)
+        if (bodyList == null && lastContentBody)
         {
             _contentBodyMap.put(messageId, Collections.singletonList(contentBody));
         }
@@ -193,17 +196,28 @@ public class MemoryMessageStore implements MessageStore
     public void storeMessageMetaData(StoreContext context, Long messageId, MessageMetaData messageMetaData)
             throws AMQException
     {
+        checkNotClosed();
         _metaDataMap.put(messageId, messageMetaData);
     }
 
-    public MessageMetaData getMessageMetaData(StoreContext context,Long messageId) throws AMQException
+    public MessageMetaData getMessageMetaData(StoreContext context, Long messageId) throws AMQException
     {
+        checkNotClosed();
         return _metaDataMap.get(messageId);
     }
 
     public ContentChunk getContentBodyChunk(StoreContext context, Long messageId, int index) throws AMQException
     {
+        checkNotClosed();
         List<ContentChunk> bodyList = _contentBodyMap.get(messageId);
         return bodyList.get(index);
     }
+
+     private void checkNotClosed() throws MessageStoreClosedException
+     {
+        if (_closed.get())
+        {
+            throw new MessageStoreClosedException();
+        }
+    }
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java b/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
new file mode 100644
index 0000000000..3d1538c7eb
--- /dev/null
+++ b/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
@@ -0,0 +1,36 @@
+package org.apache.qpid.server.store;
+
+import org.apache.qpid.AMQException;/*
+ *
+ * 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.
+ *
+ */
+
+/**
+ * NOTE: this class currently extends AMQException but
+ * we should be using AMQExceptions internally in the code base for Protocol errors hence
+ * the message store interface should throw a different super class which this should be
+ * moved to reflect
+ */
+public class MessageStoreClosedException extends AMQException
+{
+    public MessageStoreClosedException()
+    {
+        super("Message store closed");
+    }
+}