svn commit: r1753798 - in /qpid/java/trunk/broker-core/src: main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java

[lquack]

Author: lquack
Date: Fri Jul 22 14:24:31 2016
New Revision: 1753798

URL: http://svn.apache.org/viewvc?rev=1753798&view=rev
Log:
QPID-7278: [Java Broker] Remove superfluous call to 
AbstractVirtualHost#validateMessageStoreCreation

Modified:
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1753798&r1=1753797&r2=1753798&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
 Fri Jul 22 14:24:31 2016
@@ -491,13 +491,6 @@ public abstract class AbstractVirtualHos
         return _messageStore;
     }
 
-    @Override
-    public void validateOnCreate()
-    {
-        super.validateOnCreate();
-        validateMessageStoreCreation();
-    }
-
     private void validateConnectionThreadPoolSettings(VirtualHost<?> 
virtualHost)
     {
         if (virtualHost.getConnectionThreadPoolSize() < 1)

Modified: 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java?rev=1753798&r1=1753797&r2=1753798&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java
 Fri Jul 22 14:24:31 2016
@@ -119,7 +119,7 @@ public class AbstractVirtualHostTest ext
         }
     }
 
-    public void testValidateOnCreateFails()
+    public void testValidateMessageStoreCreationFails()
     {
         Map<String,Object> attributes = Collections.<String, 
Object>singletonMap(AbstractVirtualHost.NAME, getTestName());
 
@@ -134,7 +134,7 @@ public class AbstractVirtualHostTest ext
 
         try
         {
-            host.validateOnCreate();
+            host.validateMessageStoreCreation();
             fail("Validation on creation should fail");
         }
         catch(IllegalConfigurationException e)
@@ -147,7 +147,7 @@ public class AbstractVirtualHostTest ext
         }
     }
 
-    public void testValidateOnCreateSucceeds()
+    public void testValidateMessageStoreCreationSucceeds()
     {
         Map<String,Object> attributes = Collections.<String, 
Object>singletonMap(AbstractVirtualHost.NAME, getTestName());
         final MessageStore store = mock(MessageStore.class);
@@ -160,7 +160,7 @@ public class AbstractVirtualHostTest ext
             }
         };
 
-        host.validateOnCreate();
+        host.validateMessageStoreCreation();
         verify(store).openMessageStore(host);
         verify(store).closeMessageStore();
         host.close();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org