From 6ec13f0b968e930e6818f9088e815b525eadaedb Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 5 May 2006 15:05:20 +0000 Subject: re PR libgcj/27294 (gij throws NullPointerException, when the interpreter is not enabled) PR libgcj/27294: * java/lang/natVMClassLoader.cc (defineClass): Throw VirtualMachineError if no interpreter configured. From-SVN: r113554 --- libjava/java/lang/natVMClassLoader.cc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'libjava/java/lang/natVMClassLoader.cc') diff --git a/libjava/java/lang/natVMClassLoader.cc b/libjava/java/lang/natVMClassLoader.cc index bffbfc0..95c1f15 100644 --- a/libjava/java/lang/natVMClassLoader.cc +++ b/libjava/java/lang/natVMClassLoader.cc @@ -1,6 +1,6 @@ // natVMClassLoader.cc - VMClassLoader native methods -/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation +/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation This file is part of libgcj. @@ -34,6 +34,7 @@ details. */ #include #include #include +#include java::lang::Class * java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader, @@ -94,6 +95,20 @@ java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader, } #endif // INTERPRETER + if (! klass) + { + StringBuffer *sb = new StringBuffer(); + if (name) + { + sb->append(JvNewStringLatin1("found class file for class ")); + sb->append(name); + } + else + sb->append(JvNewStringLatin1("found unnamed class file")); + sb->append(JvNewStringLatin1(", but no interpreter configured in this libgcj")); + throw new VirtualMachineError(sb->toString()); + } + return klass; } -- cgit v1.1