2004-09-21 Casey Marshall <csm@gnu.org>

	* java/security/cert/X509CRLSelector.java:
	(match): remove unreachable try-catch clauses.
	Reported by: Dalibor Topic <robilad@kaffe.org>

From-SVN: r87805

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c27d6ee96bb56a62037e4bba9c714d284bd44d30..0e6212683a0d7df247c99c8fedde537eee29368f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,15 @@
+2004-09-21  Casey Marshall  <csm@gnu.org>
+
+       * java/security/cert/X509CRLSelector.java:
+       (match): remove unreachable try-catch clauses.
+       Reported by: Dalibor Topic <robilad@kaffe.org>
+
+2004-09-21  Mark Wielaard  <mark@klomp.org>
+
+       * java/util/TreeMap.java (root): Don't initialize.
+       (TreeMap(Comparator)): Call fabricateTree(0).
+       (fabricateTree): Initialize root and size when count is 0.
+
 2004-09-21  Sven de Marothy <sven@physto.se>
 
        * java/nio/ByteBuffer.java (hashCode): Implemented.

diff --git a/libjava/java/security/cert/X509CRLSelector.java b/libjava/java/security/cert/X509CRLSelector.java
index 3264e469e2e4b87a57e34c3ae676161e69f0789a..a59791e6759172a6dbb725d81d44818b2c1c0e14 100644 (file)
--- a/libjava/java/security/cert/X509CRLSelector.java
+++ b/libjava/java/security/cert/X509CRLSelector.java
@@ -378,7 +378,26 @@ public class X509CRLSelector implements CRLSelector, Cloneable
     BigInteger crlNumber = null;
     if (maxCrlNumber != null)
       {
+        byte[] b = crl.getExtensionValue(CRL_NUMBER_ID);
+        if (b == null)
+          return false;
         try
+          {
+            DERValue val = DERReader.read(b);
+            if (!(val.getValue() instanceof BigInteger))
+              return false;
+            crlNumber = (BigInteger) val.getValue();
+          }
+        catch (IOException ioe)
+          {
+            return false;
+          }
+        if (maxCrlNumber.compareTo(crlNumber) < 0)
+          return false;
+      }
+    if (minCrlNumber != null)
+      {
+        if (crlNumber == null)
           {
             byte[] b = crl.getExtensionValue(CRL_NUMBER_ID);
             if (b == null)
@@ -394,42 +413,9 @@ public class X509CRLSelector implements CRLSelector, Cloneable
               {
                 return false;
               }
-            if (maxCrlNumber.compareTo(crlNumber) < 0)
-              return false;
-          }
-        catch (CertificateParsingException cpe)
-          {
-            return false;
-          }
-      }
-    if (minCrlNumber != null)
-      {
-        try
-          {
-            if (crlNumber == null)
-              {
-                byte[] b = crl.getExtensionValue(CRL_NUMBER_ID);
-                if (b == null)
-                  return false;
-                try
-                  {
-                    DERValue val = DERReader.read(b);
-                    if (!(val.getValue() instanceof BigInteger))
-                      return false;
-                    crlNumber = (BigInteger) val.getValue();
-                  }
-                catch (IOException ioe)
-                  {
-                    return false;
-                  }
-              }
-            if (minCrlNumber.compareTo(crlNumber) > 0)
-              return false;
-          }
-        catch (CertificateParsingException cpe)
-          {
-            return false;
           }
+        if (minCrlNumber.compareTo(crlNumber) > 0)
+          return false;
       }
     if (date != null)
       {