[infinispan-commits] Infinispan SVN: r2018 - in trunk: client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol and 1 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Jul 12 10:22:25 EDT 2010
Author: mircea.markus
Date: 2010-07-12 10:22:25 -0400 (Mon, 12 Jul 2010)
New Revision: 2018
Modified:
trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/SerializationMarshaller.java
trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java
trunk/core/src/main/java/org/infinispan/util/Util.java
Log:
migrated 2017 to trunk
Modified: trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/SerializationMarshaller.java
===================================================================
--- trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/SerializationMarshaller.java 2010-07-12 14:15:55 UTC (rev 2017)
+++ trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/SerializationMarshaller.java 2010-07-12 14:22:25 UTC (rev 2018)
@@ -3,6 +3,7 @@
import org.infinispan.client.hotrod.HotRodMarshaller;
import org.infinispan.client.hotrod.exceptions.HotRodClientException;
import org.infinispan.io.ExposedByteArrayOutputStream;
+import org.infinispan.util.Util;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
@@ -70,7 +71,7 @@
ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bytes));
Object o = ois.readObject();
if (log.isTraceEnabled()) {
- log.trace("Unmarshalled bytes: " + Arrays.toString(bytes) + " and returning object: " + o);
+ log.trace("Unmarshalled bytes: " + Util.printArray(bytes, false) + " and returning object: " + o);
}
return o;
} catch (Exception e) {
Modified: trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java
===================================================================
--- trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java 2010-07-12 14:15:55 UTC (rev 2017)
+++ trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java 2010-07-12 14:22:25 UTC (rev 2018)
@@ -7,10 +7,10 @@
import org.infinispan.client.hotrod.impl.VersionedOperationResponse;
import org.infinispan.client.hotrod.impl.transport.Transport;
import org.infinispan.client.hotrod.impl.transport.TransportFactory;
+import org.infinispan.util.Util;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
@@ -173,7 +173,7 @@
if (status == NO_ERROR_STATUS || status == NOT_PUT_REMOVED_REPLACED_STATUS) {
byte[] bytes = returnPossiblePrevValue(transport, flags);
if (log.isTraceEnabled()) {
- log.trace("Returning from putIfAbsent: " + Arrays.toString(bytes));
+ log.trace("Returning from putIfAbsent: " + Util.printArray(bytes, false));
}
return bytes;
}
@@ -365,7 +365,7 @@
private byte[] returnPossiblePrevValue(Transport transport, Flag[] flags) {
if (hasForceReturn(flags)) {
byte[] bytes = transport.readArray();
- if (log.isTraceEnabled()) log.trace("Previous value bytes is: " + Arrays.toString(bytes));
+ if (log.isTraceEnabled()) log.trace("Previous value bytes is: " + Util.printArray(bytes, false));
//0-length response means null
return bytes.length == 0 ? null : bytes;
} else {
Modified: trunk/core/src/main/java/org/infinispan/util/Util.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/Util.java 2010-07-12 14:15:55 UTC (rev 2017)
+++ trunk/core/src/main/java/org/infinispan/util/Util.java 2010-07-12 14:22:25 UTC (rev 2018)
@@ -243,6 +243,7 @@
}
public static String printArray(byte[] array, boolean withHash) {
+ if (array == null) return "null";
StringBuilder sb = new StringBuilder();
sb.append("ByteArray{size=").append(array.length);
if (withHash)
More information about the infinispan-commits
mailing list