Initial load
diff --git a/test/java/lang/ClassLoader/ExceptionHidingLoader.java b/test/java/lang/ClassLoader/ExceptionHidingLoader.java
new file mode 100644
index 0000000..c6d1f87
--- /dev/null
+++ b/test/java/lang/ClassLoader/ExceptionHidingLoader.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 1998 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+   @bug 4135104
+   @summary If a badly behaved ClassLoader returns null but doesn't
+            raise an exception, the VM core dumps.
+*/
+
+
+public class ExceptionHidingLoader extends ClassLoader {
+
+    protected Class findClass(String name) throws ClassNotFoundException {
+        return null;
+    }
+
+    public static void main(String[] args) throws Exception {
+        boolean exception = false;
+
+        try {
+            Class.forName("aha", false, new ExceptionHidingLoader());
+        } catch (ClassNotFoundException e) {
+            /* VM was smart enough to detect the problem and raise an
+               exception. */
+            exception = true;
+        }
+        if (!exception) {
+            throw new Exception("Bogus loader behavior not being corrected");
+        }
+    }
+
+}