Mercurial > hg > release > icedtea7-forest-2.6 > langtools

changeset 2261:1346916e903f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u181-b00
author andrew
date Thu, 19 Apr 2018 17:55:25 +0100
parents d92707e0e3ac (current diff) 1c8c4da612ee (diff)
children 3633e24edab7
files .hgtags
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 19 04:49:53 2018 +0100
+++ b/.hgtags	Thu Apr 19 17:55:25 2018 +0100
@@ -684,3 +684,4 @@
 a10f2bfd1ce34bbbfd959a371eb709cc113039f2 jdk7u171-b02
 e952982cfa000f6fd9186d784112417148d33206 icedtea-2.6.13
 870812ffc2c6d6c2a1b1eddb53f9b9cb4eebf02a icedtea-2.6.14pre01
+1f82b6ff3455cb2408f4501c1a12e911271d10fb jdk7u181-b00
--- a/test/tools/javap/T6587786.java	Thu Apr 19 04:49:53 2018 +0100
+++ b/test/tools/javap/T6587786.java	Thu Apr 19 17:55:25 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -22,6 +22,8 @@
  */
 
 /*
+ * @ignore  until JDK-8195589 is fixed
+ *
  * @test
  * @bug 6587786
  * @summary Javap throws error : "ERROR:Could not find <classname>" for JRE classes