[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath: X509CRLSelector unreachable code removed

Kaffe CVS cvs-commits at kaffe.org
Wed Aug 25 14:58:10 PDT 2004


PatchSet 5103 
Date: 2004/08/25 21:54:15
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: X509CRLSelector unreachable code removed

2004-08-25  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/security/cert/X509CRLSelector.java:
        Resynced with GNU Classpath.

        2004-08-22  Casey Marshall  <csm at gnu.org>

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

Members: 
	ChangeLog:1.2659->1.2660 
	libraries/javalib/java/security/cert/X509CRLSelector.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2659 kaffe/ChangeLog:1.2660
--- kaffe/ChangeLog:1.2659	Wed Aug 25 21:01:51 2004
+++ kaffe/ChangeLog	Wed Aug 25 21:54:15 2004
@@ -1,5 +1,16 @@
 2004-08-25  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/security/cert/X509CRLSelector.java:
+	Resynced with GNU Classpath.
+
+	2004-08-22  Casey Marshall  <csm at gnu.org>
+
+        * java/security/cert/X509CRLSelector.java
+        (match): remove unreachable try-catch clauses.
+        Reported by: Dalibor Topic <robilad at kaffe.org>
+
+2004-08-25  Dalibor Topic  <robilad at kaffe.org>
+
 	* configure.ac: Cleaned up checks for glibc version further.
 	Moved boehm-gc checking code after header checking code to
 	make sure the glibc version checks can use feature.h, if 
Index: kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java
diff -u kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java:1.1 kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java:1.2
--- kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java:1.1	Sun Aug 22 20:06:15 2004
+++ kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java	Wed Aug 25 21:54:17 2004
@@ -378,44 +378,44 @@
     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;
+        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)
-	      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;
+        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;
       }
     if (date != null)
       {



More information about the kaffe mailing list