Imported GNU Classpath 0.90

       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.

From-SVN: r113887

1 files changed, 5 insertions, 19 deletions

diff --git a/libjava/classpath/gnu/java/rmi/server/CombinedClassLoader.java b/libjava/classpath/gnu/java/rmi/server/CombinedClassLoader.java
index 3d2e37d5377..6225fb30bc6 100644
--- a/libjava/classpath/gnu/java/rmi/server/CombinedClassLoader.java
+++ b/libjava/classpath/gnu/java/rmi/server/CombinedClassLoader.java
@@ -77,8 +77,8 @@ public class CombinedClassLoader extends ClassLoader
     while (iter.hasNext())
       {
         cl = iter.next();
-        if (!sLoaders.contains(cl))
-          sLoaders.add(iter.next());
+        if (cl!=null && !sLoaders.contains(cl))
+          sLoaders.add(cl);
       }
     
     loaders = new ClassLoader[sLoaders.size()];
@@ -96,7 +96,7 @@ public class CombinedClassLoader extends ClassLoader
       {
         try
           {
-            return findClass(name);
+            return loaders[i].loadClass(name);
           }
         catch (ClassNotFoundException e)
           {
@@ -107,27 +107,13 @@ public class CombinedClassLoader extends ClassLoader
   }
 
   /**
-   * Find the library with the given name
-   */
-  protected String findLibrary(String name)
-  {
-    for (int i = 0; i < loaders.length; i++)
-      {
-        String lib = findLibrary(name);
-        if (lib != null)
-          return lib;
-      }
-    return super.findLibrary(name);
-  }
-
-  /**
    * Find resource with the given name.
    */
   protected URL findResource(String name)
   {
     for (int i = 0; i < loaders.length; i++)
       {
-        URL resource = findResource(name);
+        URL resource = loaders[i].getResource(name);
         if (resource != null)
           return resource;
       }
@@ -141,7 +127,7 @@ public class CombinedClassLoader extends ClassLoader
   {
     for (int i = 0; i < loaders.length; i++)
       {
-        Enumeration resource = findResources(name);
+        Enumeration resource = loaders[i].getResources(name);
         if (resource != null)
           return resource;
       }