Merge
authorsherman
Thu, 20 Feb 2014 09:57:26 -0800
changeset 22998 e60a93872ff7
parent 22997 7d2259be8e79 (diff)
parent 22996 0ce70f4ef909 (current diff)
child 22999 8212fb968f9b
Merge
--- a/jdk/src/share/classes/java/util/regex/Pattern.java	Wed Dec 11 15:26:47 2013 -0800
+++ b/jdk/src/share/classes/java/util/regex/Pattern.java	Thu Feb 20 09:57:26 2014 -0800
@@ -3961,7 +3961,7 @@
      * Node class for a case sensitive/BMP-only sequence of literal
      * characters.
      */
-    static final class Slice extends SliceNode {
+    static class Slice extends SliceNode {
         Slice(int[] buf) {
             super(buf);
         }
@@ -4034,7 +4034,7 @@
      * Node class for a case sensitive sequence of literal characters
      * including supplementary characters.
      */
-    static final class SliceS extends SliceNode {
+    static final class SliceS extends Slice {
         SliceS(int[] buf) {
             super(buf);
         }
--- a/jdk/test/java/util/regex/RegExTest.java	Wed Dec 11 15:26:47 2013 -0800
+++ b/jdk/test/java/util/regex/RegExTest.java	Thu Feb 20 09:57:26 2014 -0800
@@ -32,7 +32,7 @@
  * 6358731 6178785 6284152 6231989 6497148 6486934 6233084 6504326 6635133
  * 6350801 6676425 6878475 6919132 6931676 6948903 6990617 7014645 7039066
  * 7067045 7014640 7189363 8007395 8013252 8013254 8012646 8023647 6559590
- * 8027645
+ * 8027645 8035076
  */
 
 import java.util.regex.*;