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

[Manik Surtani]

  User: msurtani
  Date: 06/08/30 04:41:53

  Modified:    src/org/jboss/cache/marshall  TreeCacheMarshaller200.java
  Log:
  Removed static logger
  
  Revision  Changes    Path
  1.2       +11 -11    JBossCache/src/org/jboss/cache/marshall/TreeCacheMarshaller200.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheMarshaller200.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/TreeCacheMarshaller200.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TreeCacheMarshaller200.java	29 Aug 2006 13:36:53 -0000	1.1
  +++ TreeCacheMarshaller200.java	30 Aug 2006 08:41:53 -0000	1.2
  @@ -34,7 +34,7 @@
   public class TreeCacheMarshaller200 extends Marshaller
   {
      // logger
  -   private static Log log = LogFactory.getLog(TreeCacheMarshaller200.class);
  +   private Log log = LogFactory.getLog(TreeCacheMarshaller200.class);
   
      // magic numbers
      protected static final int MAGICNUMBER_METHODCALL = 1;
  @@ -56,7 +56,7 @@
         init(manager, defaultInactive, useRegionBasedMarshalling);
         if (useRegionBasedMarshalling)
         {
  -         TreeCacheMarshaller200.log.debug("Using region based marshalling logic : marshalling Fqn as a String first for every call.");
  +         log.debug("Using region based marshalling logic : marshalling Fqn as a String first for every call.");
         }
      }
   
  @@ -64,7 +64,7 @@
   
      public void objectToStream(Object o, ObjectOutputStream out) throws Exception
      {
  -      if (TreeCacheMarshaller200.log.isTraceEnabled()) TreeCacheMarshaller200.log.trace("Marshalling object " + o);
  +      if (log.isTraceEnabled()) log.trace("Marshalling object " + o);
         Map refMap = new HashMap();
   
         if (useRegionBasedMarshalling)
  @@ -100,18 +100,18 @@
               if (region != null && region.isQueueing())
               {
                  Object originalRetValue = retValue;
  -               if (TreeCacheMarshaller200.log.isDebugEnabled())
  +               if (log.isDebugEnabled())
                  {
  -                  TreeCacheMarshaller200.log.debug("Received call on an ququing Fqn region (" + fqn + ").  Calling enqueueMethodCallMethod");
  +                  log.debug("Received call on an ququing Fqn region (" + fqn + ").  Calling enqueueMethodCallMethod");
                  }
                  retValue = MethodCallFactory.create(MethodDeclarations.enqueueMethodCallMethod, new Object[]{fqn, originalRetValue});
               }
            }
            catch (TreeCacheMarshaller200.InactiveRegionException e)
            {
  -            if (TreeCacheMarshaller200.log.isDebugEnabled())
  +            if (log.isDebugEnabled())
               {
  -               TreeCacheMarshaller200.log.debug("Received call on an inactive Fqn region (" + fqn + ").  Calling notifyCallOnInactiveMetod");
  +               log.debug("Received call on an inactive Fqn region (" + fqn + ").  Calling notifyCallOnInactiveMetod");
               }
               retValue = MethodCallFactory.create(MethodDeclarations.notifyCallOnInactiveMethod, new Object[]{fqn});
            }
  @@ -263,9 +263,9 @@
         else if (o instanceof Serializable)
         {
            int refId = createReference(o, refMap);
  -         if (TreeCacheMarshaller200.log.isTraceEnabled())
  +         if (log.isTraceEnabled())
            {
  -            TreeCacheMarshaller200.log.trace("Warning: using object serialization for " + o.getClass());
  +            log.trace("Warning: using object serialization for " + o.getClass());
            }
            out.writeByte(TreeCacheMarshaller200.MAGICNUMBER_SERIALIZABLE);
            out.writeShort(refId);
  @@ -424,9 +424,9 @@
            case TreeCacheMarshaller200.MAGICNUMBER_MAP:
               return unmarshallMap(in, refMap);
            default:
  -            if (TreeCacheMarshaller200.log.isErrorEnabled())
  +            if (log.isErrorEnabled())
               {
  -               TreeCacheMarshaller200.log.error("Unknown Magic Number " + magicNumber);
  +               log.error("Unknown Magic Number " + magicNumber);
               }
               throw new Exception("Unknown magic number " + magicNumber);
         }