You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/02/13 18:22:18 UTC

svn commit: r744184 [2/2] - in /qpid/trunk/qpid/java: broker/src/main/java/org/apache/qpid/server/ broker/src/main/java/org/apache/qpid/server/configuration/ broker/src/main/java/org/apache/qpid/server/exchange/ broker/src/main/java/org/apache/qpid/ser...

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java?rev=744184&r1=744183&r2=744184&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java Fri Feb 13 17:22:17 2009
@@ -73,6 +73,7 @@
         } 
         catch (Exception e)
         {
+            e.printStackTrace();
             fail(e.getMessage());
         }
     }

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=744184&r1=744183&r2=744184&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java Fri Feb 13 17:22:17 2009
@@ -30,7 +30,6 @@
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.queue.IncomingMessage;
-import org.apache.qpid.server.queue.MessageFactory;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.queue.AMQPriorityQueue;
 import org.apache.qpid.server.queue.SimpleAMQQueue;
@@ -39,6 +38,7 @@
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.ContentHeaderBody;
@@ -151,7 +151,7 @@
         //Load the Virtualhost with the required MessageStore
         reload(configuration);
 
-        MessageStore messageStore = _virtualHost.getMessageStore();
+        TransactionLog transactionLog = _virtualHost.getTransactionLog();
 
         createAllQueues();
         createAllTopicQueues();
@@ -190,9 +190,9 @@
 
         assertEquals("Not all queues correctly registered", 8, _virtualHost.getQueueRegistry().getQueues().size());
 
-        if (!messageStore.isPersistent())
+        if (!transactionLog.isPersistent())
         {
-            _logger.warn("Unable to test Persistent capabilities of messages store(" + messageStore.getClass() + ") as it is not capable of peristence.");
+            _logger.warn("Unable to test Persistent capabilities of messages store(" + transactionLog.getClass() + ") as it is not capable of peristence.");
             return;
         }
 
@@ -348,10 +348,10 @@
         try
         {
             currentMessage = new IncomingMessage(messageInfo,
-                                                 new NonTransactionalContext(_virtualHost.getMessageStore(),
+                                                 new NonTransactionalContext(_virtualHost.getTransactionLog(),
                                                                              new StoreContext(), null, null),
                                                  new InternalTestProtocolSession(),
-                                                 _virtualHost.getMessageStore());
+                                                 _virtualHost.getTransactionLog());
         }
         catch (AMQException e)
         {
@@ -388,7 +388,7 @@
 
         try
         {
-            currentMessage.routingComplete(_virtualHost.getMessageStore());
+            currentMessage.routingComplete(_virtualHost.getTransactionLog());
         }
         catch (AMQException e)
         {
@@ -486,7 +486,7 @@
 
             if (queue.isDurable() && !queue.isAutoDelete())
             {
-                _virtualHost.getMessageStore().createQueue(queue, queueArguments);
+                _virtualHost.getRoutingTable().createQueue(queue, queueArguments);
             }
         }
         catch (AMQException e)

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java?rev=744184&r1=744183&r2=744184&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java Fri Feb 13 17:22:17 2009
@@ -29,6 +29,8 @@
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.transactionlog.TransactionLog;
+import org.apache.qpid.server.routing.RoutingTable;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
@@ -37,7 +39,7 @@
  * A message store that does nothing. Designed to be used in tests that do not want to use any message store
  * functionality.
  */
-public class SkeletonMessageStore implements MessageStore
+public class SkeletonMessageStore implements TransactionLog , RoutingTable
 {
     private final AtomicLong _messageId = new AtomicLong(1);
 

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java?rev=744184&r1=744183&r2=744184&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java Fri Feb 13 17:22:17 2009
@@ -22,9 +22,9 @@
 
 import junit.framework.TestCase;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.TestMemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
@@ -283,13 +283,13 @@
 
     class TxnTester extends NullOp
     {
-        private final MessageStore store;
+        private final TransactionLog store;
 
         private final StoreContext context = new StoreContext();
 
-        TxnTester(MessageStore store)
+        TxnTester(TransactionLog transactionLog)
         {
-            this.store = store;
+            this.store = transactionLog;
         }
 
         public void prepare() throws AMQException

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java?rev=744184&r1=744183&r2=744184&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java Fri Feb 13 17:22:17 2009
@@ -30,8 +30,8 @@
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.ConsumerTagNotUniqueException;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.framing.AMQShortString;
@@ -47,7 +47,7 @@
 public class InternalBrokerBaseCase extends TestCase
 {
     protected IApplicationRegistry _registry;
-    protected MessageStore _messageStore;
+    protected TransactionLog _transactionLog;
     protected MockChannel _channel;
     protected InternalTestProtocolSession _session;
     protected VirtualHost _virtualHost;
@@ -62,7 +62,7 @@
         ApplicationRegistry.initialise(_registry);
         _virtualHost = _registry.getVirtualHostRegistry().getVirtualHost("test");        
 
-        _messageStore = _virtualHost.getMessageStore();
+        _transactionLog = _virtualHost.getTransactionLog();
 
         QUEUE_NAME = new AMQShortString("test");
         _queue = AMQQueueFactory.createAMQQueueImpl(QUEUE_NAME, false, new AMQShortString("testowner"),
@@ -78,7 +78,7 @@
 
         _session.setVirtualHost(_virtualHost);
 
-        _channel = new MockChannel(_session, 1, _messageStore);
+        _channel = new MockChannel(_session, 1, _transactionLog);
 
         _session.addChannel(_channel);
     }
@@ -91,7 +91,7 @@
 
     protected void checkStoreContents(int messageCount)
     {
-        assertEquals("Message header count incorrect in the MetaDataMap", messageCount, ((TestableMemoryMessageStore) _messageStore).getMessageMetaDataMap().size());
+        assertEquals("Message header count incorrect in the MetaDataMap", messageCount, ((TestableMemoryMessageStore) _transactionLog).getMessageMetaDataMap().size());
 
         //The above publish message is sufficiently small not to fit in the header so no Body is required.
         //assertEquals("Message body count incorrect in the ContentBodyMap", messageCount, ((TestableMemoryMessageStore) _messageStore).getContentBodyMap().size());

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java?rev=744184&r1=744183&r2=744184&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java Fri Feb 13 17:22:17 2009
@@ -27,14 +27,13 @@
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.security.access.ACLManager;
-import org.apache.qpid.server.security.access.ACLPlugin;
 import org.apache.qpid.server.security.access.plugins.AllowAll;
 import org.apache.qpid.server.security.auth.database.PropertiesPrincipalDatabaseManager;
 import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -49,11 +48,10 @@
 
     private ExchangeFactory _exchangeFactory;
 
-    private MessageStore _messageStore;
+    private TransactionLog _transactionLog;
 
     private VirtualHost _vHost;
 
-
     public TestApplicationRegistry()
     {
         super(new MapConfiguration(new HashMap()));
@@ -73,11 +71,11 @@
 
         _managedObjectRegistry = new NoopManagedObjectRegistry();
 
-        _messageStore = new TestableMemoryMessageStore();
+        _transactionLog = new TestableMemoryMessageStore();
 
         _virtualHostRegistry = new VirtualHostRegistry();
 
-        _vHost = new VirtualHost("test", _messageStore);
+        _vHost = new VirtualHost("test", _transactionLog);
 
         _virtualHostRegistry.registerVirtualHost(_vHost);
 
@@ -114,9 +112,9 @@
         _accessManager = newManager;
     }
 
-    public MessageStore getMessageStore()
+    public TransactionLog getTransactionLog()
     {
-        return _messageStore;
+        return _transactionLog;
     }
 
 }

Added: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualhostInitRoutingTableFromTransactionLogTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualhostInitRoutingTableFromTransactionLogTest.java?rev=744184&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualhostInitRoutingTableFromTransactionLogTest.java (added)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualhostInitRoutingTableFromTransactionLogTest.java Fri Feb 13 17:22:17 2009
@@ -0,0 +1,52 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.server.virtualhost;
+
+import junit.framework.TestCase;
+import org.apache.commons.configuration.PropertiesConfiguration;
+
+public class VirtualhostInitRoutingTableFromTransactionLogTest extends TestCase
+{
+    public void test()
+    {
+        PropertiesConfiguration env = new PropertiesConfiguration();
+
+
+        env.addProperty("store.class", "org.apache.qpid.server.store.MemoryMessageStore");
+
+        VirtualHost _virtualHost = null;
+        try
+        {
+            _virtualHost = new VirtualHost("test", env);
+
+            assertNotNull(_virtualHost.getTransactionLog());
+            assertNotNull(_virtualHost.getRoutingTable());
+            assertEquals(_virtualHost.getTransactionLog(),_virtualHost.getRoutingTable());
+        }
+        catch (Exception e)
+        {
+            fail(e.getMessage());
+        }
+
+
+    }
+
+}

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java?rev=744184&r1=744183&r2=744184&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java Fri Feb 13 17:22:17 2009
@@ -21,18 +21,18 @@
 package org.apache.qpid.util;
 
 import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 
 public class MockChannel extends AMQChannel
 {
-    public MockChannel(AMQProtocolSession session, int channelId, MessageStore messageStore)
+    public MockChannel(AMQProtocolSession session, int channelId, TransactionLog transactionLog)
             throws AMQException
     {
-        super(session, channelId, messageStore);
+        super(session, channelId, transactionLog);
     }
 
     public Subscription getSubscription(AMQShortString subscription)

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=744184&r1=744183&r2=744184&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java Fri Feb 13 17:22:17 2009
@@ -30,18 +30,21 @@
 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.transactionlog.TransactionLog;
+import org.apache.qpid.server.routing.RoutingTable;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-public class SlowMessageStore implements MessageStore
+public class SlowMessageStore implements TransactionLog, RoutingTable
 {
     private static final Logger _logger = Logger.getLogger(SlowMessageStore.class);
     private static final String DELAYS = "delays";
     private HashMap<String, Long> _preDelays = new HashMap<String, Long>();
     private HashMap<String, Long> _postDelays = new HashMap<String, Long>();
     private long _defaultDelay = 0L;
-    private MessageStore _realStore = new MemoryMessageStore();
+    private TransactionLog _realTransactionLog = new MemoryMessageStore();
+    private RoutingTable _realRoutingTable = (RoutingTable)_realTransactionLog;
     private static final String PRE = "pre";
     private static final String POST = "post";
     private String DEFAULT_DELAY = "default";
@@ -53,30 +56,30 @@
 
         configureDelays(delays);
 
-        String messageStoreClass = config.getString(base + ".store.class");
+        String transactionLogClass = config.getString(base + ".store.class");
 
         if (delays.containsKey(DEFAULT_DELAY))
         {
             _defaultDelay = delays.getLong(DEFAULT_DELAY);
         }
 
-        if (messageStoreClass != null)
+        if (transactionLogClass != null)
         {
-            Class clazz = Class.forName(messageStoreClass);
+            Class clazz = Class.forName(transactionLogClass);
 
             Object o = clazz.newInstance();
 
-            if (!(o instanceof MessageStore))
+            if (!(o instanceof TransactionLog))
             {
-                throw new ClassCastException("Message store class must implement " + MessageStore.class + ". Class " + clazz +
+                throw new ClassCastException("TransactionLog class must implement " + TransactionLog.class + ". Class " + clazz +
                                              " does not.");
             }
-            _realStore = (MessageStore) o;
-            _realStore.configure(virtualHost, base + ".store", config);
+            _realTransactionLog = (TransactionLog) o;
+            _realTransactionLog.configure(virtualHost, base , config);
         }
         else
         {
-            _realStore.configure(virtualHost, base + ".store", config);
+            _realTransactionLog.configure(virtualHost, base , config);
         }
     }
 
@@ -150,42 +153,42 @@
     public void close() throws Exception
     {
         doPreDelay("close");
-        _realStore.close();
+        _realTransactionLog.close();
         doPostDelay("close");
     }
 
     public void removeMessage(StoreContext storeContext, Long messageId) throws AMQException
     {
         doPreDelay("removeMessage");
-        _realStore.removeMessage(storeContext, messageId);
+        _realTransactionLog.removeMessage(storeContext, messageId);
         doPostDelay("removeMessage");
     }
 
     public void createExchange(Exchange exchange) throws AMQException
     {
         doPreDelay("createExchange");
-        _realStore.createExchange(exchange);
+        _realRoutingTable.createExchange(exchange);
         doPostDelay("createExchange");
     }
 
     public void removeExchange(Exchange exchange) throws AMQException
     {
         doPreDelay("removeExchange");
-        _realStore.removeExchange(exchange);
+        _realRoutingTable.removeExchange(exchange);
         doPostDelay("removeExchange");
     }
 
     public void bindQueue(Exchange exchange, AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
     {
         doPreDelay("bindQueue");
-        _realStore.bindQueue(exchange, routingKey, queue, args);
+        _realRoutingTable.bindQueue(exchange, routingKey, queue, args);
         doPostDelay("bindQueue");
     }
 
     public void unbindQueue(Exchange exchange, AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
     {
         doPreDelay("unbindQueue");
-        _realStore.unbindQueue(exchange, routingKey, queue, args);
+        _realRoutingTable.unbindQueue(exchange, routingKey, queue, args);
         doPostDelay("unbindQueue");
     }
 
@@ -197,56 +200,56 @@
     public void createQueue(AMQQueue queue, FieldTable arguments) throws AMQException
     {
         doPreDelay("createQueue");
-        _realStore.createQueue(queue, arguments);
+        _realRoutingTable.createQueue(queue, arguments);
         doPostDelay("createQueue");
     }
 
     public void removeQueue(AMQQueue queue) throws AMQException
     {
         doPreDelay("removeQueue");
-        _realStore.removeQueue(queue);
+        _realRoutingTable.removeQueue(queue);
         doPostDelay("removeQueue");
     }
 
     public void enqueueMessage(StoreContext context, AMQQueue queue, Long messageId) throws AMQException
     {
         doPreDelay("enqueueMessage");
-        _realStore.enqueueMessage(context, queue, messageId);
+        _realTransactionLog.enqueueMessage(context, queue, messageId);
         doPostDelay("enqueueMessage");
     }
 
     public void dequeueMessage(StoreContext context, AMQQueue queue, Long messageId) throws AMQException
     {
         doPreDelay("dequeueMessage");
-        _realStore.dequeueMessage(context, queue, messageId);
+        _realTransactionLog.dequeueMessage(context, queue, messageId);
         doPostDelay("dequeueMessage");
     }
 
     public void beginTran(StoreContext context) throws AMQException
     {
         doPreDelay("beginTran");
-        _realStore.beginTran(context);
+        _realTransactionLog.beginTran(context);
         doPostDelay("beginTran");
     }
 
     public void commitTran(StoreContext context) throws AMQException
     {
         doPreDelay("commitTran");
-        _realStore.commitTran(context);
+        _realTransactionLog.commitTran(context);
         doPostDelay("commitTran");
     }
 
     public void abortTran(StoreContext context) throws AMQException
     {
         doPreDelay("abortTran");
-        _realStore.abortTran(context);
+        _realTransactionLog.abortTran(context);
         doPostDelay("abortTran");
     }
 
     public boolean inTran(StoreContext context)
     {
         doPreDelay("inTran");
-        boolean b = _realStore.inTran(context);
+        boolean b = _realTransactionLog.inTran(context);
         doPostDelay("inTran");
         return b;
     }
@@ -254,21 +257,21 @@
     public void storeContentBodyChunk(StoreContext context, Long messageId, int index, ContentChunk contentBody, boolean lastContentBody) throws AMQException
     {
         doPreDelay("storeContentBodyChunk");
-        _realStore.storeContentBodyChunk(context, messageId, index, contentBody, lastContentBody);
+        _realTransactionLog.storeContentBodyChunk(context, messageId, index, contentBody, lastContentBody);
         doPostDelay("storeContentBodyChunk");
     }
 
     public void storeMessageMetaData(StoreContext context, Long messageId, MessageMetaData messageMetaData) throws AMQException
     {
         doPreDelay("storeMessageMetaData");
-        _realStore.storeMessageMetaData(context, messageId, messageMetaData);
+        _realTransactionLog.storeMessageMetaData(context, messageId, messageMetaData);
         doPostDelay("storeMessageMetaData");
     }
 
     public MessageMetaData getMessageMetaData(StoreContext context, Long messageId) throws AMQException
     {
         doPreDelay("getMessageMetaData");
-        MessageMetaData mmd = _realStore.getMessageMetaData(context, messageId);
+        MessageMetaData mmd = _realTransactionLog.getMessageMetaData(context, messageId);
         doPostDelay("getMessageMetaData");
         return mmd;
     }
@@ -276,14 +279,14 @@
     public ContentChunk getContentBodyChunk(StoreContext context, Long messageId, int index) throws AMQException
     {
         doPreDelay("getContentBodyChunk");
-        ContentChunk c = _realStore.getContentBodyChunk(context, messageId, index);
+        ContentChunk c = _realTransactionLog.getContentBodyChunk(context, messageId, index);
         doPostDelay("getContentBodyChunk");
         return c;
     }
 
     public boolean isPersistent()
     {
-        return _realStore.isPersistent();
+        return _realTransactionLog.isPersistent();
     }
 
 }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org