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

[Manik Surtani]

  User: msurtani
  Date: 07/06/08 11:52:15

  Modified:    src/org/jboss/cache/notifications  Notifier.java
  Log:
  Protected ctor for MethodCall, vararg ctors
  
  Revision  Changes    Path
  1.28      +9 -8      JBossCache/src/org/jboss/cache/notifications/Notifier.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Notifier.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/notifications/Notifier.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- Notifier.java	8 Jun 2007 15:39:29 -0000	1.27
  +++ Notifier.java	8 Jun 2007 15:52:15 -0000	1.28
  @@ -14,6 +14,7 @@
   import org.jboss.cache.Fqn;
   import org.jboss.cache.InvocationContext;
   import org.jboss.cache.marshall.MethodCall;
  +import org.jboss.cache.marshall.MethodCallFactory;
   import org.jboss.cache.util.MapCopy;
   import org.jboss.cache.util.concurrent.ConcurrentHashSet;
   import org.jgroups.View;
  @@ -150,7 +151,7 @@
      public void notifyNodeCreated(Fqn fqn, boolean pre, InvocationContext ctx)
      {
         boolean originLocal = ctx.isOriginLocal();
  -      MethodCall call = new MethodCall(nodeCreated, new Object[]{fqn, pre, originLocal});
  +      MethodCall call = MethodCallFactory.createWithNullId(nodeCreated, fqn, pre, originLocal);
         ctx.addCacheListenerEvent(call);
      }
   
  @@ -167,7 +168,7 @@
      {
         boolean originLocal = ctx.isOriginLocal();
         Map dataCopy = copy(data);
  -      MethodCall call = new MethodCall(nodeModified, new Object[]{fqn, pre, originLocal, modificationType, dataCopy});
  +      MethodCall call = MethodCallFactory.createWithNullId(nodeModified, fqn, pre, originLocal, modificationType, dataCopy);
         ctx.addCacheListenerEvent(call);
      }
   
  @@ -183,7 +184,7 @@
      {
         boolean originLocal = ctx.isOriginLocal();
         Map dataCopy = copy(data);
  -      MethodCall call = new MethodCall(nodeRemoved, new Object[]{fqn, pre, originLocal, dataCopy});
  +      MethodCall call = MethodCallFactory.createWithNullId(nodeRemoved, fqn, pre, originLocal, dataCopy);
         ctx.addCacheListenerEvent(call);
      }
   
  @@ -196,14 +197,14 @@
       */
      public void notifyNodeVisited(Fqn fqn, boolean pre, InvocationContext ctx)
      {
  -      MethodCall call = new MethodCall(nodeVisited, new Object[]{fqn, pre});
  +      MethodCall call = MethodCallFactory.createWithNullId(nodeVisited, fqn, pre);
         ctx.addCacheListenerEvent(call);
      }
   
      public void notifyNodeMoved(Fqn originalFqn, Fqn newFqn, boolean pre, InvocationContext ctx)
      {
         boolean originLocal = ctx.isOriginLocal();
  -      MethodCall call = new MethodCall(nodeMoved, new Object[]{originalFqn, newFqn, pre, originLocal});
  +      MethodCall call = MethodCallFactory.createWithNullId(nodeMoved, originalFqn, newFqn, pre, originLocal);
         ctx.addCacheListenerEvent(call);
      }
   
  @@ -248,7 +249,7 @@
      public void notifyNodeLoaded(Fqn fqn, boolean pre, Map<K, V> data, InvocationContext ctx)
      {
         Map<K, V> dataCopy = copy(data);
  -      MethodCall call = new MethodCall(nodeLoaded, new Object[]{fqn, pre, dataCopy});
  +      MethodCall call = MethodCallFactory.createWithNullId(nodeLoaded, fqn, pre, dataCopy);
         ctx.addCacheListenerEvent(call);
      }
   
  @@ -263,7 +264,7 @@
      public void notifyNodeActivated(Fqn fqn, boolean pre, Map<K, V> data, InvocationContext ctx)
      {
         Map<K, V> dataCopy = copy(data);
  -      MethodCall call = new MethodCall(nodeActivated, new Object[]{fqn, pre, dataCopy});
  +      MethodCall call = MethodCallFactory.createWithNullId(nodeActivated, fqn, pre, dataCopy);
         ctx.addCacheListenerEvent(call);
      }
   
  @@ -279,7 +280,7 @@
      public void notifyNodePassivated(Fqn fqn, boolean pre, Map<K, V> data, InvocationContext ctx, boolean sendImmediately)
      {
         Map<K, V> dataCopy = copy(data);
  -      MethodCall call = new MethodCall(nodePassivated, new Object[]{fqn, pre, dataCopy});
  +      MethodCall call = MethodCallFactory.createWithNullId(nodePassivated, fqn, pre, dataCopy);
         ctx.addCacheListenerEvent(call);
      }