summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2006-04-06 17:15:14 +0000
committerTom Tromey <tromey@redhat.com>2006-04-06 17:15:14 +0000
commita98e6ff4f7d6bf4d1cf2f606218b83fcc2bee527 (patch)
treef16747f7246296122727be9295924a60d90640f9
parent108113f836e7d86291f1f3ad620f7a68f102b94e (diff)
downloadclasspath-a98e6ff4f7d6bf4d1cf2f606218b83fcc2bee527.tar.gz
* javax/security/auth/x500/X500Principal.java
(readAttributeValue) Check for separator after quoted value was failing in all cases.
-rw-r--r--ChangeLog7
-rw-r--r--javax/security/auth/x500/X500Principal.java2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 09788ad72..03bba59a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-29 Nektarios K. Papadopoulos <npapadop at inaccessnetworks.com>
+
+ * javax/security/auth/x500/X500Principal.java
+ (readAttributeValue) Check for separator after quoted value was
+ failing in all cases.
+
2006-04-06 Mark Wielaard <mark@klomp.org>
* java/lang/Class.java (getClassLoader): Don't do security check
@@ -137,7 +143,6 @@
2006-04-05 Tom Tromey <tromey@redhat.com>
->>>>>>> 1.7026
* java/util/zip/ZipFile.java (available): Defer to super if
entry's size is unknown.
diff --git a/javax/security/auth/x500/X500Principal.java b/javax/security/auth/x500/X500Principal.java
index fcbb4950a..d78b0d3ee 100644
--- a/javax/security/auth/x500/X500Principal.java
+++ b/javax/security/auth/x500/X500Principal.java
@@ -395,7 +395,7 @@ public final class X500Principal implements Principal, Serializable
buf.append((char) ch);
}
sep = in.read();
- if (sep != '+' || sep != ',')
+ if (sep != '+' && sep != ',')
throw new IOException("illegal character: " + (char) ch);
return buf.toString();
}