[JENKINS-8856] Diagnostic improvement: show ‘'i' 'l' 'l' 'e' 'd' 0x0a…

…’ rather than ‘696c6c65640a’, so it is more obviously the rest of ‘Killed’.
jenkinsci · Jul 26, 2013 · d0334ba · d0334ba
1 parent 2b84547
commit d0334ba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/hudson/remoting/HexDump.java b/src/main/java/hudson/remoting/HexDump.java
@@ -12,9 +12,17 @@ public static String toHex(byte[] buf) {
     public static String toHex(byte[] buf, int start, int len) {
         StringBuilder r = new StringBuilder(len*2);
         for (int i=0; i<len; i++) {
+            if (i > 0) {
+                r.append(' ');
+            }
             byte b = buf[start+i];
-            r.append(CODE.charAt((b>>4)&15));
-            r.append(CODE.charAt(b&15));
+            if (b >= 0x20 && b <= 0x7e) {
+                r.append('\'').append((char) b).append('\'');
+            } else {
+                r.append("0x");
+                r.append(CODE.charAt((b>>4)&15));
+                r.append(CODE.charAt(b&15));
+            }
         }
         return r.toString();
     }

diff --git a/src/test/java/hudson/remoting/HexDumpTest.java b/src/test/java/hudson/remoting/HexDumpTest.java
@@ -7,6 +7,6 @@
  */
 public class HexDumpTest extends TestCase {
     public  void test1() {
-        assertEquals("0001ff",HexDump.toHex(new byte[]{0,1,-1}));
+        assertEquals("0x00 0x01 0xff 'A'", HexDump.toHex(new byte[] {0, 1, -1, 65}));
     }
 }