[jboss-cvs] JBossCache/src/org/jboss/cache/config ...

[Manik Surtani]

  User: msurtani
  Date: 07/01/15 13:10:56

  Modified:    src/org/jboss/cache/config  Configuration.java
  Log:
  Made marshallers pluggable (JBCACHE-870)
  
  Revision  Changes    Path
  1.37      +19 -0     JBossCache/src/org/jboss/cache/config/Configuration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Configuration.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/config/Configuration.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- Configuration.java	10 Jan 2007 16:25:22 -0000	1.36
  +++ Configuration.java	15 Jan 2007 18:10:56 -0000	1.37
  @@ -105,6 +105,7 @@
      private String muxStackName = null;
      private boolean usingMultiplexer = false;
      private transient RuntimeConfig runtimeConfig;
  +   private String marshallerClass = "org.jboss.cache.marshall.VersionAwareMarshaller";
   
      // ------------------------------------------------------------------------------------------------------------
      //   CONSTRUCTORS
  @@ -553,10 +554,23 @@
      private void setRuntimeConfig(RuntimeConfig runtimeConfig, boolean testImmutability)
      {
         if (testImmutability)
  +      {
            testImmutability("runtimeConfig");
  +      }
         this.runtimeConfig = runtimeConfig;
      }
   
  +   public String getMarshallerClass()
  +   {
  +      return marshallerClass;
  +   }
  +
  +   public void setMarshallerClass(String marshallerClass)
  +   {
  +      this.marshallerClass = marshallerClass;
  +   }
  +
  +
      // ------------------------------------------------------------------------------------------------------------
      //   HELPERS
      // ------------------------------------------------------------------------------------------------------------
  @@ -614,7 +628,11 @@
            return false;
         }
         if (!safeEquals(runtimeConfig, that.runtimeConfig))
  +      {
            return false;
  +      }
  +
  +      if (!safeEquals(marshallerClass, that.marshallerClass)) return false;
   
         return true;
      }
  @@ -648,6 +666,7 @@
         result = 29 * result + (muxServiceName != null ? muxServiceName.hashCode() : 0);
         result = 29 * result + (muxStackName != null ? muxStackName.hashCode() : 0);
         result = 29 * result + (runtimeConfig != null ? runtimeConfig.hashCode() : 0);
  +      result = 29 * result + (marshallerClass != null ? marshallerClass.hashCode() : 0);
         return result;
      }