Merge

Mon, 16 Jul 2012 17:05:13 -0700

author
lana
date
Mon, 16 Jul 2012 17:05:13 -0700
changeset 1291
1f8fc9e50a1f
parent 1290
934a89402f85
parent 1288
afb0a5231557
child 1292
c72c164ced67

Merge

     1.1 --- a/.hgtags	Fri Jul 13 12:58:50 2012 +0100
     1.2 +++ b/.hgtags	Mon Jul 16 17:05:13 2012 -0700
     1.3 @@ -167,3 +167,5 @@
     1.4  f8c64d835b2806293b8e924b44f0e32b20657ed3 jdk8-b43
     1.5  59cbead12ff46dbb397120bd26635bcd7d41ff21 jdk8-b44
     1.6  e111e4587ccada8eb93f72e834e378c76256f4b7 jdk8-b45
     1.7 +4ca5994971724731233735f055f33d4936fd11d3 jdk8-b46
     1.8 +7e6be2f239c9a4ac6dec280bd18ec296dd78e464 jdk8-b47
     2.1 --- a/make/tools/genstubs/GenStubs.java	Fri Jul 13 12:58:50 2012 +0100
     2.2 +++ b/make/tools/genstubs/GenStubs.java	Mon Jul 16 17:05:13 2012 -0700
     2.3 @@ -201,7 +201,7 @@
     2.4           */
     2.5          public void visitTopLevel(JCCompilationUnit tree) {
     2.6              super.visitTopLevel(tree);
     2.7 -            tree.docComments = Collections.emptyMap();
     2.8 +            tree.docComments = null;
     2.9          }
    2.10  
    2.11          /**

mercurial