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

[Elias Ross]

  User: genman  
  Date: 06/11/06 18:34:09

  Modified:    src/org/jboss/cache/marshall   MethodDeclarations.java
                        TreeCacheMarshaller200.java
  Log:
  Fix potential NPE found using static analysis, clean up unused variables, use Integer.valueOf() as an optimization
  
  Revision  Changes    Path
  1.20      +2 -2      JBossCache/src/org/jboss/cache/marshall/MethodDeclarations.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MethodDeclarations.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/MethodDeclarations.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- MethodDeclarations.java	12 Oct 2006 23:03:57 -0000	1.19
  +++ MethodDeclarations.java	6 Nov 2006 23:34:09 -0000	1.20
  @@ -30,7 +30,7 @@
    * allowing lookup operations both ways.
    *
    * @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
  - * @version $Revision: 1.19 $
  + * @version $Revision: 1.20 $
    */
   public class MethodDeclarations
   {
  @@ -339,7 +339,7 @@
       */
      public static boolean isCrudMethod(int id)
      {
  -      return crudMethodIds.contains(new Integer(id));
  +      return crudMethodIds.contains(Integer.valueOf(id));
      }
   
      public static boolean isTransactionLifecycleMethod(int id)
  
  
  
  1.8       +12 -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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- TreeCacheMarshaller200.java	13 Oct 2006 14:53:28 -0000	1.7
  +++ TreeCacheMarshaller200.java	6 Nov 2006 23:34:09 -0000	1.8
  @@ -26,6 +26,7 @@
   import java.util.Iterator;
   import java.util.List;
   import java.util.Map;
  +import java.util.Set;
   
   /**
    * An enhanced marshaller for RPC calls between TreeCache instances.
  @@ -250,7 +251,7 @@
      private int createReference(Object o, Map refMap)
      {
         int reference = refMap.size();
  -      refMap.put(o, new Integer(reference));
  +      refMap.put(o, Integer.valueOf(reference));
         return reference;
      }
   
  @@ -315,10 +316,10 @@
         out.writeInt(mapSize);
         if (mapSize == 0) return;
   
  -      for (Object k : map.keySet())
  +      for (Map.Entry me : (Set<Map.Entry>)map.entrySet())
         {
  -         marshallObject(k, out, refMap);
  -         marshallObject(map.get(k), out, refMap);
  +         marshallObject(me.getKey(), out, refMap);
  +         marshallObject(me.getValue(), out, refMap);
         }
      }
   
  @@ -356,14 +357,14 @@
            case TreeCacheMarshaller200.MAGICNUMBER_NULL:
               return null;
            case TreeCacheMarshaller200.MAGICNUMBER_REF:
  -            reference = new Integer(in.readShort());
  +            reference = Integer.valueOf(in.readShort());
               if (!refMap.containsKey(reference))
               {
                  throw new IOException("Unable to locate object reference " + reference + " in byte stream!");
               }
               return refMap.get(reference);
            case TreeCacheMarshaller200.MAGICNUMBER_SERIALIZABLE:
  -            reference = new Integer(in.readShort());
  +            reference = Integer.valueOf(in.readShort());
               retVal = in.readObject();
               refMap.put(reference, retVal);
               return retVal;
  @@ -371,12 +372,12 @@
               retVal = unmarshallMethodCall(in, refMap);
               return retVal;
            case TreeCacheMarshaller200.MAGICNUMBER_FQN:
  -            reference = new Integer(in.readShort());
  +            reference = Integer.valueOf(in.readShort());
               retVal = unmarshallFqn(in, refMap);
               refMap.put(reference, retVal);
               return retVal;
            case TreeCacheMarshaller200.MAGICNUMBER_GTX:
  -            reference = new Integer(in.readShort());
  +            reference = Integer.valueOf(in.readShort());
               retVal = unmarshallGlobalTransaction(in, refMap);
               refMap.put(reference, retVal);
               return retVal;
  @@ -388,12 +389,12 @@
            case TreeCacheMarshaller200.MAGICNUMBER_BOOLEAN:
               return in.readBoolean() ? Boolean.TRUE : Boolean.FALSE;
            case TreeCacheMarshaller200.MAGICNUMBER_INTEGER:
  -            return new Integer(in.readInt());
  +            return Integer.valueOf(in.readInt());
            case TreeCacheMarshaller200.MAGICNUMBER_LONG:
  -            retVal = new Long(in.readLong());
  +            retVal = Long.valueOf(in.readLong());
               return retVal;
            case TreeCacheMarshaller200.MAGICNUMBER_STRING:
  -            reference = new Integer(in.readShort());
  +            reference = Integer.valueOf(in.readShort());
               retVal = unmarshallString(in);
               refMap.put(reference, retVal);
               return retVal;