changeset 1333:241f86f89fe8

Merge
author alanb
date Thu, 20 Apr 2017 20:15:37 +0100
parents 129fdefafbc7 c98480dd22e7
children 24150846d041
files .hgtags
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 13 17:35:25 2017 +0100
+++ b/.hgtags	Thu Apr 20 20:15:37 2017 +0100
@@ -411,3 +411,4 @@
 6dc790a4e8310c86712cfdf7561a9820818546e6 jdk-9+164
 ed538fa31edb4cf7283d6893742a6fbc52d11751 jpms-pr2
 55419603989707ec50c84bb379bbdc1adeec3ab2 jdk-9+165
+8d3febd5c9d82e49f3e6e5f8eb10f959e7b50f83 jdk-9+166
--- a/test/javax/xml/jaxp/libs/jdk/testlibrary/ProcessTools.java	Thu Apr 13 17:35:25 2017 +0100
+++ b/test/javax/xml/jaxp/libs/jdk/testlibrary/ProcessTools.java	Thu Apr 20 20:15:37 2017 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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
@@ -256,7 +256,7 @@
      * @return Process id
      */
     public static long getProcessId() {
-        return ProcessHandle.current().getPid();
+        return ProcessHandle.current().pid();
     }
 
     /**
@@ -542,8 +542,8 @@
         }
 
         @Override
-        public long getPid() {
-            return p.getPid();
+        public long pid() {
+            return p.pid();
         }
 
         @Override