# HG changeset patch
# User acorn
# Date 1284473727 14400
# Node ID 6cde0ed1b568b4ed1f69f9dd279300e21f89b4f6
# Parent  883a82d6d41d46632ada5ab325331e8aa8346d32# Parent  8a8a7a014a12febf719586783a9861414b3a6b7e
Merge

diff -r 8a8a7a014a12 -r 6cde0ed1b568 test/runtime/6626217/Test6626217.sh
--- a/test/runtime/6626217/Test6626217.sh	Mon Sep 13 07:38:10 2010 -0700
+++ b/test/runtime/6626217/Test6626217.sh	Tue Sep 14 10:15:27 2010 -0400
@@ -1,9 +1,27 @@
-#   
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
-#
+# 
+#  Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+#  or visit www.oracle.com if you need additional information or have any
+#  questions.
+# 
 
-#
+ 
 # @test @(#)Test6626217.sh
 # @bug 6626217
 # @summary Loader-constraint table allows arrays instead of only the base-classes
@@ -96,6 +114,6 @@
 ${RM} many_loader.java
 
 ${JAVA} ${BIT_FLAG} -Xverify -Xint -cp . bug_21227 >test.out 2>&1
-grep "violates loader constraints" test.out
+grep "loader constraint" test.out
 exit $?