Merge from trunkjava-broker-config-store-changes

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-config-store-changes@1584926 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 12 deletions

diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
index ab18c8f41d..da868a01f1 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
@@ -33,14 +33,14 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException;
  * Mock implementation of a (Store) Transaction allow its state to be observed.
  * Also provide a factory method to produce TestTransactionLog objects suitable
  * for unit test use.
- * 
+ *
  */
 class MockStoreTransaction implements Transaction
 {
     enum TransactionState {NOT_STARTED, STARTED, COMMITTED, ABORTED};
 
     private TransactionState _state = TransactionState.NOT_STARTED;
-    
+
     private int _numberOfEnqueuedMessages = 0;
     private int _numberOfDequeuedMessages = 0;
     private boolean _throwExceptionOnQueueOp;
@@ -52,7 +52,7 @@ class MockStoreTransaction implements Transaction
 
     public void setState(TransactionState state)
     {
-        _state = state; 
+        _state = state;
     }
 
     public TransactionState getState()
@@ -64,10 +64,10 @@ class MockStoreTransaction implements Transaction
     {
         if (_throwExceptionOnQueueOp)
         {
-            
+
             throw new ServerScopedRuntimeException("Mocked exception");
         }
-        
+
         _numberOfEnqueuedMessages++;
     }
 
@@ -87,7 +87,7 @@ class MockStoreTransaction implements Transaction
         {
             throw new ServerScopedRuntimeException("Mocked exception");
         }
-        
+
         _numberOfDequeuedMessages++;
     }
 
@@ -124,12 +124,6 @@ class MockStoreTransaction implements Transaction
                 storeTransaction.setState(TransactionState.STARTED);
                 return storeTransaction;
             }
-
-            @Override
-            public String getStoreType()
-            {
-                return "TEST";
-            }
        };
     }
 }
\ No newline at end of file