changeset 1520:1f8fc9e50a1f

Merge
author lana
date Mon, 16 Jul 2012 17:05:13 -0700
parents 934a89402f85 afb0a5231557
children c72c164ced67
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;
         }
 
         /**