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

[Manik Surtani]

  User: msurtani
  Date: 07/01/25 09:12:07

  Modified:    src/org/jboss/cache/marshall  VersionAwareMarshaller.java
  Log:
  JBCACHE-948
  
  Revision  Changes    Path
  1.19      +10 -6     JBossCache/src/org/jboss/cache/marshall/VersionAwareMarshaller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: VersionAwareMarshaller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/VersionAwareMarshaller.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- VersionAwareMarshaller.java	21 Jan 2007 15:46:43 -0000	1.18
  +++ VersionAwareMarshaller.java	25 Jan 2007 14:12:07 -0000	1.19
  @@ -10,6 +10,7 @@
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.RegionManager;
  +import org.jboss.cache.config.Configuration;
   
   import java.io.ByteArrayOutputStream;
   import java.io.InputStream;
  @@ -30,18 +31,16 @@
    */
   public class VersionAwareMarshaller extends AbstractMarshaller
   {
  +   
  +   private static final Log log = LogFactory.getLog(VersionAwareMarshaller.class);
  +   private static final int VERSION_200 = 20;
  +   
      private RegionManager manager;
      private boolean defaultInactive, useRegionBasedMarshalling;
  -   private Log log = LogFactory.getLog(VersionAwareMarshaller.class);
  -
      AbstractMarshaller defaultMarshaller;
      Map<Integer, Marshaller> marshallers = new HashMap<Integer, Marshaller>();
  -
  -   private static final int VERSION_200 = 20;
  -
      private int versionInt;
   
  -
      public VersionAwareMarshaller(RegionManager manager, boolean defaultInactive, boolean useRegionBasedMarshalling, String version)
      {
         this.manager = manager;
  @@ -69,6 +68,11 @@
         }
      }
   
  +   public VersionAwareMarshaller(RegionManager regionManager, Configuration configuration)
  +   {
  +      this(regionManager, configuration.isInactiveOnStartup(), configuration.isUseRegionBasedMarshalling(), configuration.getReplVersionString());
  +   }
  +
      /**
       * Converts versions to known compatible version ids.
       * <p/>