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

[Elias Ross]

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

  Modified:    src/org/jboss/cache  GlobalTransaction.java
  Log:
  Fix potential NPE found using static analysis, clean up unused variables, use Integer.valueOf() as an optimization
  
  Revision  Changes    Path
  1.15      +11 -9     JBossCache/src/org/jboss/cache/GlobalTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: GlobalTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/GlobalTransaction.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- GlobalTransaction.java	25 Aug 2006 14:10:09 -0000	1.14
  +++ GlobalTransaction.java	6 Nov 2006 23:34:08 -0000	1.15
  @@ -22,17 +22,19 @@
    *
    * @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 12, 2003
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   public class GlobalTransaction implements Externalizable {
  -   Address addr=null;
  -   long id=-1;
  -   private static long sid=0;
  -   private transient boolean remote=false;
   
      private static final long serialVersionUID = 8011434781266976149L;
   
  -   // cash the hashcode
  +   private static long sid = 0;
  +   
  +   private Address addr = null;
  +   private long id = -1;
  +   private transient boolean remote = false;
  +
  +   // cache the hashcode
      private transient int hash_code=-1;  // in the worst case, hashCode() returns 0, then increases, so we're safe here
   
       /**
  @@ -114,9 +116,9 @@
      }
   
      public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
  -      addr=(Address)in.readObject();
  -      id=in.readLong();
  -      // hash_code=in.readInt();
  +      addr = (Address)in.readObject();
  +      id = in.readLong();
  +      hash_code = -1;
      }
   
      /**