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

[Manik Surtani]

  User: msurtani
  Date: 06/07/19 17:34:43

  Modified:    src/org/jboss/cache/buddyreplication  BuddyManager.java
  Log:
  JBCACHE-657
  JBCACHE-594
  
  Revision  Changes    Path
  1.37      +5 -4      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.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- BuddyManager.java	18 Jul 2006 20:34:43 -0000	1.36
  +++ BuddyManager.java	19 Jul 2006 21:34:43 -0000	1.37
  @@ -24,6 +24,7 @@
   import org.jboss.cache.marshall.VersionAwareMarshaller;
   import org.jboss.cache.xml.XmlHelper;
   import org.jgroups.View;
  +import org.jgroups.Address;
   import org.jgroups.blocks.MethodCall;
   import org.jgroups.stack.IpAddress;
   import org.w3c.dom.Element;
  @@ -395,7 +396,7 @@
           Fqn integrationBase = new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,
                                         newGroup.getGroupName());
           VersionAwareMarshaller marshaller = null;
  -        if (cache.getUseRegionBasedMarshalling())
  +        if (cache.getConfiguration().isUseRegionBasedMarshalling())
           {
              marshaller = cache.getMarshaller();
           }
  @@ -453,7 +454,7 @@
        * List excludes self.  Used by the BaseRPCInterceptor when deciding
        * who to replicate to.
        */
  -    public List getBuddyAddresses()
  +    public List<Address> getBuddyAddresses()
       {
           return buddyGroup.buddies;
       }
  @@ -528,7 +529,7 @@
   
           Map stateMap = new HashMap();
           byte[] state = null;
  -        if (cache.getUseRegionBasedMarshalling())
  +        if (cache.getConfiguration().isUseRegionBasedMarshalling())
           {
              RegionManager rm = cache.getRegionManager();
              Region[] regions = rm.getRegions();
  @@ -544,7 +545,7 @@
                     }
                 }
              }
  -           else if (!cache.isInactiveOnStartup())
  +           else if (!cache.getConfiguration().isInactiveOnStartup())
              {
                 // No regions defined; try the root
                 state = acquireState(Fqn.ROOT);