From 64089cc9f030d8ef7972adb5d117e0b23f47d62b Mon Sep 17 00:00:00 2001
From: mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 18 May 2006 17:29:21 +0000
Subject:        Imported GNU Classpath 0.90        * scripts/makemake.tcl:
 LocaleData.java moved to gnu/java/locale.

       * sources.am: Regenerated.
       * gcj/javaprims.h: Regenerated.
       * Makefile.in: Regenerated.
       * gcj/Makefile.in: Regenerated.
       * include/Makefile.in: Regenerated.
       * testsuite/Makefile.in: Regenerated.

       * gnu/java/lang/VMInstrumentationImpl.java: New override.
       * gnu/java/net/local/LocalSocketImpl.java: Likewise.
       * gnu/classpath/jdwp/VMMethod.java: Likewise.
       * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
       interface.
       * java/lang/Thread.java: Add UncaughtExceptionHandler.
       * java/lang/reflect/Method.java: Implements GenericDeclaration and
       isSynthetic(),
       * java/lang/reflect/Field.java: Likewise.
       * java/lang/reflect/Constructor.java
       * java/lang/Class.java: Implements Type, GenericDeclaration,
       getSimpleName() and getEnclosing*() methods.
       * java/lang/Class.h: Add new public methods.
       * java/lang/Math.java: Add signum(), ulp() and log10().
       * java/lang/natMath.cc (log10): New function.
       * java/security/VMSecureRandom.java: New override.
       * java/util/logging/Logger.java: Updated to latest classpath
       version.
       * java/util/logging/LogManager.java: New override.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113887 138bc75d-0d04-0410-961f-82ee72b054a4
---
 .../gnu/java/security/x509/X500DistinguishedName.java      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'libjava/classpath/gnu/java/security/x509/X500DistinguishedName.java')

diff --git a/libjava/classpath/gnu/java/security/x509/X500DistinguishedName.java b/libjava/classpath/gnu/java/security/x509/X500DistinguishedName.java
index daf746f5dc5..02adad7d2fd 100644
--- a/libjava/classpath/gnu/java/security/x509/X500DistinguishedName.java
+++ b/libjava/classpath/gnu/java/security/x509/X500DistinguishedName.java
@@ -1,5 +1,5 @@
 /* X500DistinguishedName.java -- X.500 distinguished name.
-   Copyright (C) 2004  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -61,7 +61,6 @@ import java.util.Set;
 
 public class X500DistinguishedName implements Principal
 {
-
   // Constants and fields.
   // -------------------------------------------------------------------------
 
@@ -221,6 +220,10 @@ public class X500DistinguishedName implements Principal
       putComponent(DC, value);
     else if (name.equals("uid"))
       putComponent(UID, value);
+    else if (name.equals("o"))
+      putComponent(O, value);
+    else if (name.equals("ou"))
+      putComponent(OU, value);
     else
       putComponent(new OID(name), value);
   }
@@ -328,16 +331,18 @@ public class X500DistinguishedName implements Principal
   {
     if (fixed && encoded != null)
       return (byte[]) encoded.clone();
+
     ArrayList name = new ArrayList(components.size());
     for (Iterator it = components.iterator(); it.hasNext(); )
       {
         Map m = (Map) it.next();
         if (m.isEmpty())
           continue;
+
         Set rdn = new HashSet();
         for (Iterator it2 = m.entrySet().iterator(); it2.hasNext(); )
           {
-            Map.Entry e = (Map.Entry) it.next();
+            Map.Entry e = (Map.Entry) it2.next();
             ArrayList atav = new ArrayList(2);
             atav.add(new DERValue(DER.OBJECT_IDENTIFIER, e.getKey()));
             atav.add(new DERValue(DER.UTF8_STRING, e.getValue()));
@@ -486,6 +491,9 @@ public class X500DistinguishedName implements Principal
                 throw new EOFException();
               default:
                 buf.append((char) ch);
+                ch = in.read();
+                if (ch == -1)
+                  return buf.toString();
               }
           }
       }
-- 
cgit v1.2.3