# HG changeset patch
# User lana
# Date 1342483513 25200
# Node ID 1f8fc9e50a1fae3f9c5cee8ece7e8b7f8b012aaa
# Parent  934a89402f8562b0d9e02f5b7c7452326ea1f294# Parent  afb0a523155727d42b1c773f783ff3a7cfab8e86
Merge

diff -r 934a89402f85 -r 1f8fc9e50a1f .hgtags
--- a/.hgtags	Fri Jul 13 12:58:50 2012 +0100
+++ b/.hgtags	Mon Jul 16 17:05:13 2012 -0700
@@ -167,3 +167,5 @@
 f8c64d835b2806293b8e924b44f0e32b20657ed3 jdk8-b43
 59cbead12ff46dbb397120bd26635bcd7d41ff21 jdk8-b44
 e111e4587ccada8eb93f72e834e378c76256f4b7 jdk8-b45
+4ca5994971724731233735f055f33d4936fd11d3 jdk8-b46
+7e6be2f239c9a4ac6dec280bd18ec296dd78e464 jdk8-b47
diff -r 934a89402f85 -r 1f8fc9e50a1f make/tools/genstubs/GenStubs.java
--- a/make/tools/genstubs/GenStubs.java	Fri Jul 13 12:58:50 2012 +0100
+++ b/make/tools/genstubs/GenStubs.java	Mon Jul 16 17:05:13 2012 -0700
@@ -201,7 +201,7 @@
          */
         public void visitTopLevel(JCCompilationUnit tree) {
             super.visitTopLevel(tree);
-            tree.docComments = Collections.emptyMap();
+            tree.docComments = null;
         }
 
         /**