This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push: new 588af85 GEODE-2113 implement SSL over NIO 588af85 is described below commit 588af8522a48b1fcaf045bb9ce028e4e8422dcba Author: Bruce Schuchardt <bschucha...@pivotal.io> AuthorDate: Thu Jan 31 11:04:03 2019 -0800 GEODE-2113 implement SSL over NIO Removing modifications to ProcessManager that were inadvertently committed with the SSL implementation code. --- .../apache/geode/test/dunit/internal/ProcessManager.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java index 9572cf6..32ab6c8 100755 --- a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java +++ b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java @@ -159,22 +159,10 @@ class ProcessManager implements ChildVMLauncher { private void linkStreams(final String version, final int vmNum, final ProcessHolder holder, final InputStream in, final PrintStream out) { - final String vmName = "[" + VM.getVMName(version, vmNum); + final String vmName = "[" + VM.getVMName(version, vmNum) + "] "; Thread ioTransport = new Thread() { @Override public void run() { - StringBuffer sb = new StringBuffer(); - // use low four bytes for backward compatibility - long time = System.currentTimeMillis() & 0xffffffffL; - for (int i = 0; i < 4; i++) { - String hex = Integer.toHexString((int) (time & 0xff)); - if (hex.length() < 2) { - sb.append('0'); - } - sb.append(hex); - time = time / 0x100; - } - String uniqueString = vmName + ", 0x" + sb.toString() + "] "; BufferedReader reader = new BufferedReader(new InputStreamReader(in)); try { String line = reader.readLine(); @@ -182,7 +170,7 @@ class ProcessManager implements ChildVMLauncher { if (line.length() == 0) { out.println(); } else { - out.print(uniqueString); + out.print(vmName); out.println(line); } line = reader.readLine();