harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r823214 - in /harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200: CpBands.java IcTuple.java
Date Thu, 08 Oct 2009 15:54:14 GMT
Author: odeakin
Date: Thu Oct  8 15:54:13 2009
New Revision: 823214

URL: http://svn.apache.org/viewvc?rev=823214&view=rev
Log:
Minor fixes for findbugs failures - comment out an unnecessary !=null check as there is already
a check before the TODO and add a null check to the IcTuple.equals() method.

Modified:
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java?rev=823214&r1=823213&r2=823214&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java
Thu Oct  8 15:54:13 2009
@@ -553,13 +553,13 @@
             if(index != null) {
             	return cpUTF8Value(index.intValue());
             }
-// TODO: mapSignature is not filled anywhere
-//            if(searchForIndex) {
-//            	index = (Integer)mapSignature.get(string);
-//            }
+            /* TODO: mapSignature is not filled anywhere
+            if(searchForIndex) {
+                index = (Integer)mapSignature.get(string);
+            }
             if(index != null) {
             	return cpSignatureValue(index.intValue());
-            }
+            }*/
             cputf8 = new CPUTF8(string, -1);
             stringsToCPUTF8.put(string, cputf8);
         }

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java?rev=823214&r1=823213&r2=823214&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java
Thu Oct  8 15:54:13 2009
@@ -288,7 +288,7 @@
     }
 
     public boolean equals(Object object) {
-        if (object.getClass() != this.getClass()) {
+        if ((object == null) || (object.getClass() != this.getClass())) {
             return false;
         }
         IcTuple compareTuple = (IcTuple) object;



Mime
View raw message