[hornetq-commits] JBoss hornetq SVN: r7953 - trunk/src/main/org/hornetq/core/config/impl.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2009-09-10 22:25:29 -0400 (Thu, 10 Sep 2009)
New Revision: 7953

Modified:
   trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
Log:
removing collections from equals (fixing FileConfigurationTest)

Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java	2009-09-10 22:39:33 UTC (rev 7952)
+++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java	2009-09-11 02:25:29 UTC (rev 7953)
@@ -868,13 +868,6 @@
       if (getClass() != obj.getClass())
          return false;
       ConfigurationImpl other = (ConfigurationImpl)obj;
-      if (acceptorConfigs == null)
-      {
-         if (other.acceptorConfigs != null)
-            return false;
-      }
-      else if (!acceptorConfigs.equals(other.acceptorConfigs))
-         return false;
       if (asyncConnectionExecutionEnabled != other.asyncConnectionExecutionEnabled)
          return false;
       if (backup != other.backup)
@@ -893,69 +886,21 @@
       }
       else if (!bindingsDirectory.equals(other.bindingsDirectory))
          return false;
-      if (bridgeConfigurations == null)
-      {
-         if (other.bridgeConfigurations != null)
-            return false;
-      }
-      else if (!bridgeConfigurations.equals(other.bridgeConfigurations))
+       if (clustered != other.clustered)
          return false;
-      if (broadcastGroupConfigurations == null)
-      {
-         if (other.broadcastGroupConfigurations != null)
-            return false;
-      }
-      else if (!broadcastGroupConfigurations.equals(other.broadcastGroupConfigurations))
-         return false;
-      if (clusterConfigurations == null)
-      {
-         if (other.clusterConfigurations != null)
-            return false;
-      }
-      else if (!clusterConfigurations.equals(other.clusterConfigurations))
-         return false;
-      if (clustered != other.clustered)
-         return false;
       if (connectionTTLOverride != other.connectionTTLOverride)
          return false;
-      if (connectorConfigs == null)
-      {
-         if (other.connectorConfigs != null)
-            return false;
-      }
-      else if (!connectorConfigs.equals(other.connectorConfigs))
-         return false;
       if (createBindingsDir != other.createBindingsDir)
          return false;
       if (createJournalDir != other.createJournalDir)
          return false;
-      if (discoveryGroupConfigurations == null)
-      {
-         if (other.discoveryGroupConfigurations != null)
-            return false;
-      }
-      else if (!discoveryGroupConfigurations.equals(other.discoveryGroupConfigurations))
-         return false;
-      if (divertConfigurations == null)
-      {
-         if (other.divertConfigurations != null)
-            return false;
-      }
-      else if (!divertConfigurations.equals(other.divertConfigurations))
-         return false;
+      
       if (fileDeploymentEnabled != other.fileDeploymentEnabled)
          return false;
       if (fileDeploymentScanPeriod != other.fileDeploymentScanPeriod)
          return false;
       if (idCacheSize != other.idCacheSize)
          return false;
-      if (interceptorClassNames == null)
-      {
-         if (other.interceptorClassNames != null)
-            return false;
-      }
-      else if (!interceptorClassNames.equals(other.interceptorClassNames))
-         return false;
       if (jmxManagementEnabled != other.jmxManagementEnabled)
          return false;
       if (journalAIOBufferSize != other.journalAIOBufferSize)
@@ -1058,13 +1003,6 @@
          return false;
       if (queueActivationTimeout != other.queueActivationTimeout)
          return false;
-      if (queueConfigurations == null)
-      {
-         if (other.queueConfigurations != null)
-            return false;
-      }
-      else if (!queueConfigurations.equals(other.queueConfigurations))
-         return false;
       if (scheduledThreadPoolMaxSize != other.scheduledThreadPoolMaxSize)
          return false;
       if (securityEnabled != other.securityEnabled)