[infinispan-commits] Infinispan SVN: r1610 - in trunk/core/src/main/java/org/infinispan: util and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-03-18 10:38:47 -0400 (Thu, 18 Mar 2010)
New Revision: 1610

Modified:
   trunk/core/src/main/java/org/infinispan/marshall/MarshalledValue.java
   trunk/core/src/main/java/org/infinispan/util/Util.java
Log:
Added a convenience method to print byte arrays.

Modified: trunk/core/src/main/java/org/infinispan/marshall/MarshalledValue.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/MarshalledValue.java	2010-03-18 10:30:10 UTC (rev 1609)
+++ trunk/core/src/main/java/org/infinispan/marshall/MarshalledValue.java	2010-03-18 14:38:47 UTC (rev 1610)
@@ -27,6 +27,7 @@
 import org.infinispan.io.UnsignedNumeric;
 import org.infinispan.remoting.transport.Address;
 import org.infinispan.transaction.xa.GlobalTransaction;
+import org.infinispan.util.Util;
 
 import java.io.IOException;
 import java.io.NotSerializableException;
@@ -207,11 +208,11 @@
    @Override
    public String toString() {
       StringBuilder sb = new StringBuilder()
-         .append("MarshalledValue(")
-         .append("instance=").append(instance != null ? instance.toString() : "<undeserialized>")
-         .append("; cachedHashCode=").append(cachedHashCode)
-         .append("; serialized=").append(raw != null)
-         .append(")@").append(Integer.toHexString(System.identityHashCode(this)));
+         .append("MarshalledValue{")
+         .append("instance=").append(instance != null ? instance.toString() : "<serialized>")
+         .append(", serialized=").append(raw != null ?  Util.printArray(raw, false) : "false")
+         .append(", cachedHashCode=").append(cachedHashCode)
+         .append("}@").append(Integer.toHexString(System.identityHashCode(this)));
       return sb.toString();
    }
 

Modified: trunk/core/src/main/java/org/infinispan/util/Util.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/Util.java	2010-03-18 10:30:10 UTC (rev 1609)
+++ trunk/core/src/main/java/org/infinispan/util/Util.java	2010-03-18 14:38:47 UTC (rev 1610)
@@ -244,5 +244,19 @@
          }
       }
       return value.toString();
-   }    
+   }
+
+   public static String printArray(byte[] array, boolean withHash) {
+      StringBuilder sb = new StringBuilder();
+      sb.append("ByteArray{size=").append(array.length);
+      if (withHash)
+         sb.append(", hashCode=").append(Integer.toHexString(array.hashCode()));
+
+      sb.append(", array=[");
+      for (int i = 0; i < 10; i++)
+         sb.append(array[i]).append(", ");
+      sb.append("..]}");
+
+      return sb.toString();
+   }
 }