geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onich...@apache.org
Subject [geode] 04/10: Revert "GEODE-2113 implement SSL over NIO"
Date Tue, 20 Aug 2019 19:05:52 GMT
This is an automated email from the ASF dual-hosted git repository.

onichols pushed a commit to branch release/1.9.1
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 6d1851081d445302fa40cf9c73f2c62656d80502
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
AuthorDate: Thu Jun 27 14:35:23 2019 -0700

    Revert "GEODE-2113 implement SSL over NIO"
    
    This reverts commit 588af8522a48b1fcaf045bb9ce028e4e8422dcba.
---
 .../apache/geode/test/dunit/internal/ProcessManager.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 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 c0e1237..d43b644 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,10 +159,22 @@ 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();
@@ -170,7 +182,7 @@ class ProcessManager implements ChildVMLauncher {
             if (line.length() == 0) {
               out.println();
             } else {
-              out.print(vmName);
+              out.print(uniqueString);
               out.println(line);
             }
             line = reader.readLine();


Mime
View raw message