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

[Manik Surtani]

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

  Modified:    src/org/jboss/cache/buddyreplication  BuddyManager.java
  Log:
  Made marshallers pluggable (JBCACHE-870)
  
  Revision  Changes    Path
  1.59      +2 -2      JBossCache/src/org/jboss/cache/buddyreplication/BuddyManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BuddyManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/buddyreplication/BuddyManager.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -b -r1.58 -r1.59
  --- BuddyManager.java	4 Jan 2007 05:35:40 -0000	1.58
  +++ BuddyManager.java	15 Jan 2007 18:10:57 -0000	1.59
  @@ -16,10 +16,10 @@
   import org.jboss.cache.config.BuddyReplicationConfig;
   import org.jboss.cache.config.BuddyReplicationConfig.BuddyLocatorConfig;
   import org.jboss.cache.lock.TimeoutException;
  +import org.jboss.cache.marshall.Marshaller;
   import org.jboss.cache.marshall.MethodCall;
   import org.jboss.cache.marshall.MethodCallFactory;
   import org.jboss.cache.marshall.MethodDeclarations;
  -import org.jboss.cache.marshall.VersionAwareMarshaller;
   import org.jboss.cache.statetransfer.StateTransferManager;
   import org.jboss.util.stream.MarshalledValueInputStream;
   import org.jgroups.Address;
  @@ -407,7 +407,7 @@
         // Integrate state transfer from the data owner of the buddy group
         Fqn integrationBase = new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,
                 newGroup.getGroupName());
  -      VersionAwareMarshaller marshaller = null;
  +      Marshaller marshaller = null;
         if (cache.getConfiguration().isUseRegionBasedMarshalling())
         {
            marshaller = cache.getMarshaller();