* java/lang/natClassLoader.cc:

	(_Jv_PrepareCompiledClass): Throw NoClassDefFoundError, per spec.
	* resolve.cc: Include NoClassDefFoundError.h, not
	ClassNotFoundException.h.
	(_Jv_ResolvePoolEntry): Throw NoClassDefFoundError, per spec.
	* defineclass.cc: Don't include ClassNotFoundException.h.

From-SVN: r57516

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2e5a4120e5ea66da5a4a04e24ac9f531ceb1ef18..b97f9d53da074db1302673ea17a2b378bed7e8c8 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,12 @@
 2002-09-25  Tom Tromey  <tromey@redhat.com>
 
+       * java/lang/natClassLoader.cc: 
+       (_Jv_PrepareCompiledClass): Throw NoClassDefFoundError, per spec.
+       * resolve.cc: Include NoClassDefFoundError.h, not
+       ClassNotFoundException.h.
+       (_Jv_ResolvePoolEntry): Throw NoClassDefFoundError, per spec.
+       * defineclass.cc: Don't include ClassNotFoundException.h.
+
        * resolve.cc: Include StringBuffer.
        (_Jv_ResolvePoolEntry): Use StringBuffer to create error string.
 

diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc
index 95e671f42a39d1efa6ecb2e6df1c35e679741edb..6a250dadda6910bee6ee415223195d099d9dd765 100644 (file)
--- a/libjava/defineclass.cc
+++ b/libjava/defineclass.cc
@@ -35,7 +35,6 @@ details.  */
 #include <java/lang/ClassFormatError.h>
 #include <java/lang/NoClassDefFoundError.h>
 #include <java/lang/ClassCircularityError.h>
-#include <java/lang/ClassNotFoundException.h>
 #include <java/lang/IncompatibleClassChangeError.h>
 #include <java/lang/reflect/Modifier.h>
 

diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index 9c83d593ebb77b1119ec132a176795504a7c98c5..d33614dbf032866976df139a0ce48ac7c57c1c09 100644 (file)
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -260,7 +260,7 @@ _Jv_PrepareCompiledClass (jclass klass)
          if (! found)
            {
              jstring str = _Jv_NewStringUTF (name->data);
-             throw new java::lang::ClassNotFoundException (str);
+             throw new java::lang::NoClassDefFoundError (str);
            }
 
          pool->data[index].clazz = found;

diff --git a/libjava/resolve.cc b/libjava/resolve.cc
index 90df67b8ab96b8ac2d9f52992b965a03dff02cdd..af1f7c60c1af0faa23afbd75080fd9c4b4d3cd25 100644 (file)
--- a/libjava/resolve.cc
+++ b/libjava/resolve.cc
@@ -29,7 +29,7 @@ details.  */
 #include <java/lang/ClassFormatError.h>
 #include <java/lang/IllegalAccessError.h>
 #include <java/lang/AbstractMethodError.h>
-#include <java/lang/ClassNotFoundException.h>
+#include <java/lang/NoClassDefFoundError.h>
 #include <java/lang/IncompatibleClassChangeError.h>
 #include <java/lang/reflect/Modifier.h>
 
@@ -98,7 +98,8 @@ _Jv_ResolvePoolEntry (jclass klass, int index)
       if (! found)
        {
          jstring str = _Jv_NewStringUTF (name->data);
-         throw new java::lang::ClassNotFoundException (str);
+         // This exception is specified in JLS 2nd Ed, section 5.1.
+         throw new java::lang::NoClassDefFoundError (str);
        }
 
       if ((found->accflags & Modifier::PUBLIC) == Modifier::PUBLIC