/[classpath]/classpath/javax/security/auth/x500/X500Principal.java
ViewVC logotype

Diff of /classpath/javax/security/auth/x500/X500Principal.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.4.2.3 by gnu_andrew, Tue Aug 2 20:12:36 2005 UTC revision 1.4.2.4 by gnu_andrew, Tue Aug 16 16:22:38 2005 UTC
# Line 274  public final class X500Principal impleme Line 274  public final class X500Principal impleme
274          Set rdn = new HashSet();          Set rdn = new HashSet();
275          for (Iterator it2 = m.entrySet().iterator(); it2.hasNext(); )          for (Iterator it2 = m.entrySet().iterator(); it2.hasNext(); )
276            {            {
277              Map.Entry e = (Map.Entry) it.next();              Map.Entry e = (Map.Entry) it2.next();
278              ArrayList atav = new ArrayList(2);              ArrayList atav = new ArrayList(2);
279              atav.add(new DERValue(DER.OBJECT_IDENTIFIER, e.getKey()));              atav.add(new DERValue(DER.OBJECT_IDENTIFIER, e.getKey()));
280              atav.add(new DERValue(DER.UTF8_STRING, e.getValue()));              atav.add(new DERValue(DER.UTF8_STRING, e.getValue()));
# Line 300  public final class X500Principal impleme Line 300  public final class X500Principal impleme
300          putComponent(key, value);          putComponent(key, value);
301          if (sep == ',')          if (sep == ',')
302            newRelativeDistinguishedName();            newRelativeDistinguishedName();
303            if (sep == -1)
304              break;
305        }        }
306    }    }
307    
# Line 312  public final class X500Principal impleme Line 314  public final class X500Principal impleme
314          if (ch == -1)          if (ch == -1)
315            {            {
316              if (buf.length() > 0)              if (buf.length() > 0)
317                throw new EOFException();                throw new EOFException("partial name read: " + buf);
318              return null;              return null;
319            }            }
320          if (ch > 127)          if (ch > 127)
# Line 416  public final class X500Principal impleme Line 418  public final class X500Principal impleme
418                case ';':                case ';':
419                  throw new IOException("illegal character: " + (char) ch);                  throw new IOException("illegal character: " + (char) ch);
420                case -1:                case -1:
421                  throw new EOFException();                  sep = -1;
422                    return buf.toString ();
423                default:                default:
424                  buf.append((char) ch);                  buf.append((char) ch);
425                }                }
426                ch = in.read ();
427            }            }
428        }        }
429    }    }
# Line 484  public final class X500Principal impleme Line 488  public final class X500Principal impleme
488        putComponent(STREET, value);        putComponent(STREET, value);
489      else if (name.equals("st"))      else if (name.equals("st"))
490        putComponent(ST, value);        putComponent(ST, value);
491        else if (name.equals ("o"))
492          putComponent (O, value);
493        else if (name.equals ("ou"))
494          putComponent (OU, value);
495      else if (name.equals("dc"))      else if (name.equals("dc"))
496        putComponent(DC, value);        putComponent(DC, value);
497      else if (name.equals("uid"))      else if (name.equals("uid"))

Legend:
Removed from v.1.4.2.3  
changed lines
  Added in v.1.4.2.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26