natClass.cc (finalize): Make sure that the class really has an engine.

2011-07-12  Andrew Haley  <aph@redhat.com>

	* java/lang/natClass.cc (finalize): Make sure that the class
	really has an engine.

From-SVN: r176199

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 684b4aa88f59e48aea0ca9012dd030ade402eb8f..4715590d9e7d1f1ef7254403c7b446ea50719c38 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-12  Andrew Haley  <aph@redhat.com>
+
+       * java/lang/natClass.cc (finalize): Make sure that the class
+       really has an engine.
+
 2011-07-07  Matthias Klose  <doko@ubuntu.com>
 
        * libtool-version: Bump soversion.

diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index 9f9f05ed8e5c13264ce4a40d5e0b206ad404c59e..ec4a18f1b51bde9fceb9a9f06fa6631eb152ab29 100644 (file)
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -668,7 +668,9 @@ java::lang::Class::newInstance (void)
 void
 java::lang::Class::finalize (void)
 {
-  engine->unregister(this);
+  // Array classes don't have an engine, and don't need to be finalized.
+   if (engine)
+     engine->unregister(this);
 }
 
 #ifdef INTERPRETER