OpenJDK / jdk-updates / jdk12u
changeset 44680:14e2d9d2811c
Merge
author | lana |
---|---|
date | Thu, 13 Apr 2017 16:27:12 +0000 |
parents | c76b4f1a6ac8 7638b8c03875 |
children | e789f5f2053d ceda9d37e102 8b3b3b911b8a |
files | |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/jaxp/test/javax/xml/jaxp/libs/jdk/testlibrary/ProcessTools.java Thu Apr 13 16:01:13 2017 +0000 +++ b/jaxp/test/javax/xml/jaxp/libs/jdk/testlibrary/ProcessTools.java Thu Apr 13 16:27:12 2017 +0000 @@ -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