Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorduke
Thu, 24 Aug 2017 16:30:23 +0200
changeset 45957 d3eb7790a38d
parent 45956 832f85797be8 (diff)
parent 45954 58c92a58e1ef (current diff)
child 45959 554ed368461d
Merge
jdk/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java file | annotate | diff | comparison | revisions
jdk/test/java/lang/ClassLoader/deadlock/Alice.java file | annotate | diff | comparison | revisions
jdk/test/java/lang/ClassLoader/deadlock/Bob.java file | annotate | diff | comparison | revisions
jdk/test/java/lang/ClassLoader/deadlock/Starter.java file | annotate | diff | comparison | revisions
jdk/test/java/lang/ClassLoader/deadlock/SupAlice.java file | annotate | diff | comparison | revisions
jdk/test/java/lang/ClassLoader/deadlock/SupBob.java file | annotate | diff | comparison | revisions
jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh file | annotate | diff | comparison | revisions
jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh file | annotate | diff | comparison | revisions
nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditPad.java file | annotate | diff | comparison | revisions 
--- a/jaxws/.hgtags	Thu Aug 24 16:30:20 2017 +0200
+++ b/jaxws/.hgtags	Thu Aug 24 16:30:23 2017 +0200
@@ -439,3 +439,4 @@
 ea819b6009d33a72e6672bab6c101d51db0cfb4c jdk-9+176
 b44a721aee3d3b2537754e559fe9ecccadea548b jdk-9+177
 6d17fd0a5133a0dd916c77a9a24ae7f0ca402876 jdk-10+15
+bc8289ce1ed3ed5fff62152ed46da3be0b60b7c3 jdk-10+16
--- a/jaxws/src/java.activation/share/classes/javax/activation/CommandInfo.java	Thu Aug 24 16:30:20 2017 +0200
+++ b/jaxws/src/java.activation/share/classes/javax/activation/CommandInfo.java	Thu Aug 24 16:30:23 2017 +0200
@@ -112,7 +112,7 @@
      * this method will check if it implements the
      * java.io.Externalizable interface. If it does, the bean's
      * readExternal method will be called if an InputStream
-     * can be acquired from the DataHandler.<p>
+     * can be acquired from the DataHandler.
      *
      * @param dh        The DataHandler that describes the data to be
      *                  passed to the command.
jdk-sandbox