From 3886bb1a20944cf4c7501f07ed2474db218bdd8c Mon Sep 17 00:00:00 2001
From: Peter Bailis <pbailis@cs.berkeley.edu>
Date: Fri, 20 Jul 2012 13:56:40 -0700
Subject: [PATCH 1/2] Include log4j resources.dir in all tests via build.xml

---
 build.properties | 3 ---
 build.xml        | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.properties b/build.properties
index f64eb57de0..f363ea1bff 100644
--- a/build.properties
+++ b/build.properties
@@ -36,8 +36,5 @@ tomcat.manager.username=tomcat
 tomcat.manager.password=tomcat
 tomcat.context=/voldemort
 
-## Log4j
-log4j.properties.dir=src/java
-
 ## Release
 curr.release=0.90.1
diff --git a/build.xml b/build.xml
index d664ea97fb..b92a53d3a0 100644
--- a/build.xml
+++ b/build.xml
@@ -27,6 +27,7 @@
   </condition>
 
   <path id="contrib-classpath">
+    <pathelement path="${resources.dir}" />
     <fileset dir="${dist.dir}">
       <include name="${name}-${curr.release}.jar" />
     </fileset>
@@ -37,6 +38,7 @@
   </path>
 
   <path id="test-classpath">
+    <pathelement path="${resources.dir}" />
     <pathelement path="${env.VOLD_TEST_JARS}" />
     <path refid="main-classpath" />
     <pathelement path="${testclasses.dir}" />
@@ -372,7 +374,6 @@
     <replace-dir dir="${testhtml.dir}" />
     <junit printsummary="yes" showoutput="true" maxmemory="1024m">
       <classpath refid="test-classpath" />
-      <classpath path="${log4j.properties.dir}" />
       <formatter type="xml" />
       <batchtest fork="yes" todir="${testreport.dir}">
         <fileset dir="${unittestsrc.dir}">

From 2c6b61f198de355b0274b49b52fece1531e25b63 Mon Sep 17 00:00:00 2001
From: Peter Bailis <pbailis@cs.berkeley.edu>
Date: Fri, 20 Jul 2012 14:28:37 -0700
Subject: [PATCH 2/2] PUT returns null, leading to a NullPointerException when
 debug logging is enabled in SocketStore

---
 src/java/voldemort/store/socket/SocketStore.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java/voldemort/store/socket/SocketStore.java b/src/java/voldemort/store/socket/SocketStore.java
index 3781a77cbe..91b8dd5600 100644
--- a/src/java/voldemort/store/socket/SocketStore.java
+++ b/src/java/voldemort/store/socket/SocketStore.java
@@ -445,7 +445,7 @@ private void invokeCallback(Object o, long requestTime) {
                                      + clientRequestExecutor.getSocketChannel()
                                                             .socket()
                                                             .getLocalPort() + " result: "
-                                     + o.toString());
+                                     + o);
                     }
 
                     callback.requestComplete(o, requestTime);