From: mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 19 Apr 2005 10:18:45 +0000 (+0000)
Subject: 2005-04-19  Michael Koch  <konqueror@gmx.de>
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=77217a45bccab77d0e63c8fa38ad8d9e95917b5a

2005-04-19  Michael Koch  <konqueror@gmx.de>

	* gnu/java/security/x509/X509Certificate.java
	(parse): Handle val == null case.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98397 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7b78f977258..6ab56c5f48a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-19  Michael Koch  <konqueror@gmx.de>
+
+	* gnu/java/security/x509/X509Certificate.java
+	(parse): Handle val == null case.
+
 2005-04-19  Roman Kennke  <roman@kennke.org>
 
 	* javax/swing/plaf/metal/MetalLookAndFeel.java
diff --git a/libjava/gnu/java/security/x509/X509Certificate.java b/libjava/gnu/java/security/x509/X509Certificate.java
index 29606d11979..5d8f1d91c0c 100644
--- a/libjava/gnu/java/security/x509/X509Certificate.java
+++ b/libjava/gnu/java/security/x509/X509Certificate.java
@@ -622,10 +622,9 @@ public class X509Certificate extends java.security.cert.X509Certificate
         else
           {
             algVal = val.getEncoded();
-          }
-        if (val.isConstructed())
-          {
-            encoded.skip(val.getLength());
+	    
+	    if (val.isConstructed())
+	      encoded.skip(val.getLength());
           }
         debug("read algorithm parameters == " + algVal);
       }