# HG changeset patch
# User asaha
# Date 1288242637 25200
# Node ID 1bfe369fe439aef060788fe50c2ac2fe87ec4fe8
# Parent  7c0095d515e3ea0ce4aa16714cb68a2bc25ffd3e# Parent  1f8f7240a1e29be69de64bd26035835f1033640d
Merge

diff -r 7c0095d515e3 -r 1bfe369fe439 jdk/src/share/classes/java/lang/ClassLoader.java
--- 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)
      *