Permalink
Browse files

Merge pull request #85 from pbailis/master

Enable log4j.properties in all tests and fix hidden debug NPE
  • Loading branch information...
2 parents d15b605 + 2c6b61f commit b8f0be4bb762a59fa15c1b2d2ef45bb09c14f6f9 @zhongjiewu zhongjiewu committed Aug 1, 2012
Showing with 3 additions and 5 deletions.
  1. +0 −3 build.properties
  2. +2 −1 build.xml
  3. +1 −1 src/java/voldemort/store/socket/SocketStore.java
View
@@ -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
View
@@ -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}">
@@ -445,7 +445,7 @@ private void invokeCallback(Object o, long requestTime) {
+ clientRequestExecutor.getSocketChannel()
.socket()
.getLocalPort() + " result: "
- + o.toString());
+ + o);
}
callback.requestComplete(o, requestTime);

0 comments on commit b8f0be4

Please sign in to comment.