[kaffe] CVS kaffe (kaz): kaffe/kaffevm/readClass.c(readClass): Return NULL when to throw

[Kaffe CVS]

PatchSet 7474 
Date: 2007/04/04 15:53:01
Author: kaz
Branch: HEAD
Tag: (none) 
Log:
2007-04-04 Ito Kazumitsu  <kaz at maczuka.gcd.org>

	* kaffe/kaffevm/readClass.c(readClass): Return NULL when to throw
	UnsupportedClassVersionError. Accept class files of version 1.5.

Members: 
	ChangeLog:1.4973->1.4974 
	kaffe/kaffevm/readClass.c:1.28->1.29 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4973 kaffe/ChangeLog:1.4974
--- kaffe/ChangeLog:1.4973	Wed Feb 14 14:39:45 2007
+++ kaffe/ChangeLog	Wed Apr  4 15:53:01 2007
@@ -1,3 +1,8 @@
+2007-04-04 Ito Kazumitsu  <kaz at maczuka.gcd.org>
+
+	* kaffe/kaffevm/readClass.c(readClass): Return NULL when to throw
+	UnsupportedClassVersionError. Accept class files of version 1.5.
+
 2007-02-14 Alper Akcan <alper at kaffe.org>
 
 	* libraries/clib/awt/xynth/Makefile.am,
Index: kaffe/kaffe/kaffevm/readClass.c
diff -u kaffe/kaffe/kaffevm/readClass.c:1.28 kaffe/kaffe/kaffevm/readClass.c:1.29
--- kaffe/kaffe/kaffevm/readClass.c:1.28	Mon Apr 17 17:57:07 2006
+++ kaffe/kaffe/kaffevm/readClass.c	Wed Apr  4 15:53:02 2007
@@ -62,12 +62,14 @@
 	if (! ((major_version == MAJOR_VERSION_V1_1 && minor_version == MINOR_VERSION_V1_1) ||
 	       (major_version == MAJOR_VERSION_V1_2 && minor_version == MINOR_VERSION_V1_2) ||
 	       (major_version == MAJOR_VERSION_V1_3 && minor_version == MINOR_VERSION_V1_3) ||
-	       (major_version == MAJOR_VERSION_V1_4 && minor_version == MINOR_VERSION_V1_4))) {
+	       (major_version == MAJOR_VERSION_V1_4 && minor_version == MINOR_VERSION_V1_4) ||
+	       (major_version == MAJOR_VERSION_V1_5 && minor_version == MINOR_VERSION_V1_5))) {
 		postExceptionMessage(einfo,
 				     JAVA_LANG(UnsupportedClassVersionError),
 				     "%d.%d",
 				     major_version,
 				     minor_version);
+		return NULL;
 	}
 
 	if (readConstantPool(classThis, fp, einfo) == false) {