Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.

From-SVN: r107049

5 files changed, 52 insertions, 33 deletions

diff --git a/libjava/classpath/javax/security/auth/Subject.java b/libjava/classpath/javax/security/auth/Subject.java
index 4e35a64..1659c64 100644
--- a/libjava/classpath/javax/security/auth/Subject.java
+++ b/libjava/classpath/javax/security/auth/Subject.java
@@ -1,5 +1,5 @@
 /* Subject.java -- a single entity in the system.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -385,19 +385,19 @@ public final class Subject implements Serializable
     // Constructors.
     // -----------------------------------------------------------------------
 
-    SecureSet (final Subject subject, final int type, final Collection elements)
+    SecureSet (final Subject subject, final int type, final Collection inElements)
     {
       this (subject, type);
-      for (Iterator it = elements.iterator(); it.hasNext(); )
+      for (Iterator it = inElements.iterator(); it.hasNext(); )
         {
           Object o = it.next();
           if (type == PRINCIPALS && !(o instanceof Principal))
             {
               throw new IllegalArgumentException(o+" is not a Principal");
             }
-          if (!elements.contains (o))
+          if (!this.elements.contains (o))
             {
-              elements.add (o);
+              this.elements.add (o);
             }
         }
     }
@@ -511,7 +511,7 @@ public final class Subject implements Serializable
 
     public synchronized boolean contains (final Object element)
     {
-      return elements.remove (element);
+      return elements.contains (element);
     }
 
     public boolean removeAll (final Collection c)
diff --git a/libjava/classpath/javax/security/auth/SubjectDomainCombiner.java b/libjava/classpath/javax/security/auth/SubjectDomainCombiner.java
index 94a7160..927e747 100644
--- a/libjava/classpath/javax/security/auth/SubjectDomainCombiner.java
+++ b/libjava/classpath/javax/security/auth/SubjectDomainCombiner.java
@@ -1,5 +1,5 @@
 /* SubjectDomainCombiner.java -- domain combiner for Subjects.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -67,8 +67,9 @@ public class SubjectDomainCombiner implements DomainCombiner
                                      final ProtectionDomain[] assigned)
   {
     LinkedList domains = new LinkedList();
-    Principal[] principals =
-      (Principal[]) subject.getPrincipals().toArray (new Principal[0]);
+    Principal[] principals = null;
+    if (subject != null)
+      principals = (Principal[]) subject.getPrincipals().toArray (new Principal[0]);
     if (current != null)
       {
         for (int i = 0; i < current.length; i++)
diff --git a/libjava/classpath/javax/security/auth/login/Configuration.java b/libjava/classpath/javax/security/auth/login/Configuration.java
index 1e0d272..eb5e4a8 100644
--- a/libjava/classpath/javax/security/auth/login/Configuration.java
+++ b/libjava/classpath/javax/security/auth/login/Configuration.java
@@ -67,29 +67,7 @@ public abstract class Configuration
     SecurityManager sm = System.getSecurityManager();
     if (sm != null)
       sm.checkPermission (new AuthPermission ("getLoginConfiguration"));
-    if (config == null)
-      {
-        String conf = (String) AccessController.doPrivileged
-          (new PrivilegedAction()
-            {
-              public Object run()
-              {
-                return Security.getProperty ("login.configuration.provider");
-              }
-            });
-        try
-          {
-            if (conf != null)
-              config = (Configuration) Class.forName (conf).newInstance();
-            else
-              config = new NullConfiguration();
-          }
-        catch (Exception x)
-          {
-            config = new NullConfiguration();
-          }
-      }
-    return config;
+    return getConfig();
   }
 
   public static synchronized void setConfiguration (Configuration config)
@@ -115,6 +93,28 @@ public abstract class Configuration
    */
   static Configuration getConfig()
   {
+    if (config == null)
+      {
+        String conf = (String) AccessController.doPrivileged
+          (new PrivilegedAction()
+            {
+              public Object run()
+              {
+                return Security.getProperty ("login.configuration.provider");
+              }
+            });
+        try
+          {
+            if (conf != null)
+              config = (Configuration) Class.forName (conf).newInstance();
+            else
+              config = new NullConfiguration();
+          }
+        catch (Exception x)
+          {
+            config = new NullConfiguration();
+          }
+      }
     return config;
   }
 }
diff --git a/libjava/classpath/javax/security/auth/login/LoginContext.java b/libjava/classpath/javax/security/auth/login/LoginContext.java
index 8fc2ca7..a3cbf8f 100644
--- a/libjava/classpath/javax/security/auth/login/LoginContext.java
+++ b/libjava/classpath/javax/security/auth/login/LoginContext.java
@@ -220,7 +220,9 @@ public class LoginContext
     Exception cause = null;
     try
       {
-        module = (LoginModule) Class.forName (entry.getLoginModuleName()).newInstance();
+	ClassLoader cl = Thread.currentThread().getContextClassLoader();
+	Class c = Class.forName(entry.getLoginModuleName(), true, cl);
+	module = (LoginModule) c.newInstance();
       }
     catch (ClassNotFoundException cnfe)
       {
diff --git a/libjava/classpath/javax/security/auth/x500/X500Principal.java b/libjava/classpath/javax/security/auth/x500/X500Principal.java
index 78c35ad..fcbb495 100644
--- a/libjava/classpath/javax/security/auth/x500/X500Principal.java
+++ b/libjava/classpath/javax/security/auth/x500/X500Principal.java
@@ -140,6 +140,22 @@ public final class X500Principal implements Principal, Serializable
   // Instance methods.
   // ------------------------------------------------------------------------
 
+  public int hashCode()
+  {
+    int result = size();
+    for (int i = 0; i < size(); ++i)
+      {
+        Map m = (Map) components.get(i);
+        for (Iterator it2 = m.entrySet().iterator(); it2.hasNext(); )
+          {
+            Map.Entry e = (Map.Entry) it2.next();
+            // We don't bother looking at the value of the entry.
+            result = result * 31 + ((OID) e.getKey()).hashCode();
+          }
+      }
+    return result;
+  }
+
   public boolean equals(Object o)
   {
     if (!(o instanceof X500Principal))