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

[Manik Surtani]

  User: msurtani
  Date: 07/05/25 12:34:51

  Modified:    src/org/jboss/cache/interceptors  
                        DataGravitatorInterceptor.java
                        UnlockInterceptor.java
  Log:
  Fixed some pretty nasty BR issues
  
  Revision  Changes    Path
  1.44      +3 -1      JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DataGravitatorInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -b -r1.43 -r1.44
  --- DataGravitatorInterceptor.java	25 May 2007 12:38:26 -0000	1.43
  +++ DataGravitatorInterceptor.java	25 May 2007 16:34:51 -0000	1.44
  @@ -114,7 +114,7 @@
   
                        // very strange, the invocation contexts get twisted up here, and will need preservation.
                        // a bit crappy and hacky, all will be solved when we move to JBoss AOP in 2.1.0
  -                     ctx.setMethodCall(m);
  +                     //ctx.setMethodCall(m);
   
                        // Clean up the other nodes
                        cleanBackupData(data, ctx.getGlobalTransaction());
  @@ -319,6 +319,8 @@
         List<Address> mbrs = cache.getMembers();
         Boolean searchSubtrees = (buddyManager.isDataGravitationSearchBackupTrees() ? Boolean.TRUE : Boolean.FALSE);
         MethodCall dGrav = MethodCallFactory.create(MethodDeclarations.dataGravitationMethod, fqn, searchSubtrees);
  +      // doing a GET_ALL is crappy but necessary since JGroups' GET_FIRST could return null results from nodes that do
  +      // not have either the primary OR backup, and stop polling other valid nodes.
         List resps = cache.getRPCManager().callRemoteMethods(mbrs, dGrav, GroupRequest.GET_ALL, true, buddyManager.getBuddyCommunicationTimeout());
         if (log.isTraceEnabled())
         {
  
  
  
  1.16      +5 -1      JBossCache/src/org/jboss/cache/interceptors/UnlockInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UnlockInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/UnlockInterceptor.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- UnlockInterceptor.java	23 May 2007 15:22:03 -0000	1.15
  +++ UnlockInterceptor.java	25 May 2007 16:34:51 -0000	1.16
  @@ -15,7 +15,7 @@
    * LockTable. This is a no-op if a transaction is used.
    *
    * @author Bela Ban
  - * @version $Id: UnlockInterceptor.java,v 1.15 2007/05/23 15:22:03 msurtani Exp $
  + * @version $Id: UnlockInterceptor.java,v 1.16 2007/05/25 16:34:51 msurtani Exp $
    */
   public class UnlockInterceptor extends Interceptor
   {
  @@ -36,6 +36,10 @@
         {
            return super.invoke(ctx);
         }
  +      catch (Throwable th)
  +      {
  +         throw th;
  +      }
         finally
         {
            if (ctx.getOptionOverrides() == null || !ctx.getOptionOverrides().isSuppressLocking())