[infinispan-commits] Infinispan SVN: r826 - trunk/core/src/main/java/org/infinispan/config.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2009-09-16 09:05:28 -0400 (Wed, 16 Sep 2009)
New Revision: 826

Modified:
   trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
Log:
equals() check for shutdown type was incorrect, it needs to be based on its attributes, like the other types, rather than on reference equality.

Modified: trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java	2009-09-16 11:53:03 UTC (rev 825)
+++ trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java	2009-09-16 13:05:28 UTC (rev 826)
@@ -358,7 +358,8 @@
          return false;
       if (asyncTransportExecutor.properties != null ? !asyncTransportExecutor.properties.equals(that.asyncTransportExecutor.properties) : that.asyncTransportExecutor.properties != null)
          return false;
-      if (transport.clusterName != null ? !transport.clusterName.equals(that.transport.clusterName) : that.transport.clusterName != null) return false;
+      if (transport.clusterName != null ? !transport.clusterName.equals(that.transport.clusterName) : that.transport.clusterName != null) 
+         return false;
       if (defaultConfiguration != null ? !defaultConfiguration.equals(that.defaultConfiguration) : that.defaultConfiguration != null)
          return false;
       if (evictionScheduledExecutor.factory != null ? !evictionScheduledExecutor.factory.equals(that.evictionScheduledExecutor.factory) : that.evictionScheduledExecutor.factory != null)
@@ -371,7 +372,8 @@
          return false;
       if (replicationQueueScheduledExecutor.properties != null ? !replicationQueueScheduledExecutor.properties.equals(that.replicationQueueScheduledExecutor.properties) : that.replicationQueueScheduledExecutor.properties != null)
          return false;
-      if (shutdown != that.shutdown) return false;
+      if (shutdown.hookBehavior != null ? !shutdown.hookBehavior.equals(that.shutdown.hookBehavior) : that.shutdown.hookBehavior != null) 
+         return false;
       if (transport.transportClass != null ? !transport.transportClass.equals(that.transport.transportClass) : that.transport.transportClass != null)
          return false;
       if (transport.properties != null ? !transport.properties.equals(that.transport.properties) : that.transport.properties != null)
@@ -666,7 +668,7 @@
 
       public void accept(ConfigurationBeanVisitor v) {
          v.visitShutdownType(this);
-      }               
+      }
    }
 }