Merge
authorasaha
Wed, 27 Oct 2010 22:10:37 -0700
changeset 7036 1bfe369fe439
parent 7035 7c0095d515e3 (current diff)
parent 7029 1f8f7240a1e2 (diff)
child 7037 9fd3887c8010
Merge
--- a/jdk/src/share/classes/java/lang/ClassLoader.java	Wed Oct 27 13:53:15 2010 -0700
+++ b/jdk/src/share/classes/java/lang/ClassLoader.java	Wed Oct 27 22:10:37 2010 -0700
@@ -553,6 +553,13 @@
      *          If either <tt>off</tt> or <tt>len</tt> is negative, or if
      *          <tt>off+len</tt> is greater than <tt>b.length</tt>.
      *
+     * @throws  SecurityException
+     *          If an attempt is made to add this class to a package that
+     *          contains classes that were signed by a different set of
+     *          certificates than this class, or if an attempt is made
+     *          to define a class in a package with a fully-qualified name
+     *          that starts with "{@code java.}".
+     *
      * @see  #loadClass(String, boolean)
      * @see  #resolveClass(Class)
      *