QPID-32 : Add persistence to work with ShortStrings

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

6 files changed, 20 insertions, 11 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
index d7326b4c64..6f93a14469 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
@@ -174,7 +174,7 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
         try
         {
             queue.delete();
-            _messageStore.removeQueue(queueName);
+            _messageStore.removeQueue(new AMQShortString(queueName));
 
         }
         catch (AMQException ex)
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
index bbe1464bdc..7a0edf2f06 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
@@ -98,7 +98,7 @@ public class QueueDeleteHandler  implements StateAwareMethodListener<QueueDelete
             else
             {
                 int purged = queue.delete(body.ifUnused, body.ifEmpty);
-                _store.removeQueue(queue.getName().toString());
+                _store.removeQueue(queue.getName());
                 // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
                 // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
                 // Be aware of possible changes to parameter order as versions change.
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java b/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
index 446cf5ec2c..2fb2bdd2e3 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
@@ -180,11 +180,11 @@ public class WeakReferenceMessageHandle implements AMQMessageHandle
 
     public void enqueue(StoreContext storeContext, long messageId, AMQQueue queue) throws AMQException
     {
-        _messageStore.enqueueMessage(storeContext, queue.getName().toString(), messageId);
+        _messageStore.enqueueMessage(storeContext, queue.getName(), messageId);
     }
 
     public void dequeue(StoreContext storeContext, long messageId, AMQQueue queue) throws AMQException
     {
-        _messageStore.dequeueMessage(storeContext, queue.getName().toString(), messageId);
+        _messageStore.dequeueMessage(storeContext, queue.getName(), messageId);
     }
 }
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 edf2386314..98a4c3f6e7 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
@@ -24,6 +24,7 @@ import org.apache.commons.configuration.Configuration;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.ContentBody;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MessageMetaData;
 import org.apache.qpid.server.queue.QueueRegistry;
@@ -100,17 +101,17 @@ public class MemoryMessageStore implements MessageStore
         // Not required to do anything
     }
 
-    public void removeQueue(String name) throws AMQException
+    public void removeQueue(AMQShortString name) throws AMQException
     {
         // Not required to do anything
     }
 
-    public void enqueueMessage(StoreContext context, String name, long messageId) throws AMQException
+    public void enqueueMessage(StoreContext context, AMQShortString name, long messageId) throws AMQException
     {
         // Not required to do anything
     }
 
-    public void dequeueMessage(StoreContext context, String name, long messageId) throws AMQException
+    public void dequeueMessage(StoreContext context, AMQShortString name, long messageId) throws AMQException
     {
         // Not required to do anything
     }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java b/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
index 973c661c06..c9c7045402 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.store;
 import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.ContentBody;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MessageMetaData;
 import org.apache.qpid.server.queue.QueueRegistry;
@@ -52,11 +53,11 @@ public interface MessageStore
 
     void createQueue(AMQQueue queue) throws AMQException;
 
-    void removeQueue(String name) throws AMQException;
+    void removeQueue(AMQShortString name) throws AMQException;
 
-    void enqueueMessage(StoreContext context, String name, long messageId) throws AMQException;
+    void enqueueMessage(StoreContext context, AMQShortString name, long messageId) throws AMQException;
 
-    void dequeueMessage(StoreContext context, String name, long messageId) throws AMQException;
+    void dequeueMessage(StoreContext context, AMQShortString name, long messageId) throws AMQException;
 
     void beginTran(StoreContext context) throws AMQException;
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java b/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
index ff6abdd58b..f430a44ba0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
@@ -143,6 +143,13 @@ public class LocalTransactionalContext implements TransactionalContext
             _ackOp = null;
         }
 
-        _txnBuffer.commit(_storeContext);
+        try
+        {
+            _txnBuffer.commit(_storeContext);
+        }
+        finally
+        {
+            _inTran = false;
+        }
     }
 }