--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/NullRedefineClassesTests.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2003-2004 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 4920005 4882798
+ * @summary make sure redefineClasses throws NullPointerException in the right places.
+ * @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
+ *
+ * @run build NullRedefineClassesTests
+ * @run shell MakeJAR.sh redefineAgent
+ * @run main/othervm -javaagent:redefineAgent.jar NullRedefineClassesTests NullRedefineClassesTests
+ */
+
+import java.lang.instrument.ClassDefinition;
+import java.lang.instrument.UnmodifiableClassException;
+
+public class
+NullRedefineClassesTests
+    extends ASimpleInstrumentationTestCase
+{
+
+    /**
+     * Constructor for NullRedefineClassesTests.
+     * @param name
+     */
+    public NullRedefineClassesTests(String name) {
+        super(name);
+    }
+
+    public static void
+    main (String[] args) throws Throwable {
+        ATestCaseScaffold   test = new NullRedefineClassesTests(args[0]);
+        test.runTest();
+    }
+
+    protected final void
+    doRunTest() throws ClassNotFoundException, UnmodifiableClassException  {
+        testNullRedefineClasses();
+    }
+
+
+    public void
+    testNullRedefineClasses() throws ClassNotFoundException, UnmodifiableClassException {
+        boolean caught;
+
+        // Test that a null argument throws NullPointerException
+        caught = false;
+        try {
+            fInst.redefineClasses(null);
+        } catch (NullPointerException npe) {
+            caught = true;
+        }
+        assertTrue(caught);
+
+        // Test that a null element throws NullPointerException
+        caught = false;
+        try {
+            fInst.redefineClasses(new ClassDefinition[]{ null });
+        } catch (NullPointerException npe) {
+            caught = true;
+        }
+        assertTrue(caught);
+
+        // Test that a null element amonst others throws NullPointerException
+        caught = false;
+        ClassDefinition cd = new ClassDefinition(DummyClass.class, new byte[] {1, 2, 3});
+        try {
+            fInst.redefineClasses(new ClassDefinition[]{ cd, null });
+        } catch (NullPointerException npe) {
+            caught = true;
+        }
+        assertTrue(caught);
+
+        // Test that a null class throws NullPointerException
+        caught = false;
+        try {
+            new ClassDefinition(null, new byte[] {1, 2, 3});
+        } catch (NullPointerException npe) {
+            caught = true;
+        }
+        assertTrue(caught);
+
+        // Test that a null byte array throws NullPointerException
+        caught = false;
+        try {
+            new ClassDefinition(DummyClass.class, null);
+        } catch (NullPointerException npe) {
+            caught = true;
+        }
+        assertTrue(caught);
+    }
+}