summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2005-04-19 10:18:45 +0000
committermkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2005-04-19 10:18:45 +0000
commit77217a45bccab77d0e63c8fa38ad8d9e95917b5a (patch)
tree9f84fe54bd580999f2267358b07a42de7a46067f
parent0fdc612ebf0f1ccf0cd2ba2c1fa2b072716db15b (diff)
downloadppe42-gcc-77217a45bccab77d0e63c8fa38ad8d9e95917b5a.tar.gz
ppe42-gcc-77217a45bccab77d0e63c8fa38ad8d9e95917b5a.zip
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
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/gnu/java/security/x509/X509Certificate.java7
2 files changed, 8 insertions, 4 deletions
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);
}
OpenPOWER on IntegriCloud