commit 5261772b598441fad147eb50a74f2421c34587ec
author Yuta HIGUCHI <y-higuchi@onlab.us> Fri Mar 14 13:36:10 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon Mar 17 11:32:18 2014 -0700
tree 48c4ae4f95f36187b0ca78c7f47df47b0232adb0
parent 1d7ac267d511d94af072e151fa7e9cefa022bd6d

RAMCloud bug fix

- multiRead was not returning version info.
- workaround for certain g++ version complaining about cast between same type.
- removing g++ option we don't need anymore now that -Werror is removed.

Change-Id: I9b060575acd76fdfe3e9d17b4df83efd59edf1cc

src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc

diff --git a/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc b/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc
index a0dd0ce..830fd47 100644
--- a/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc
+++ b/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc
@@ -228,7 +228,7 @@
     RamCloud* ramcloud = NULL;
     try {
         ramcloud = new RamCloud(locator.string);
-    } EXCEPTION_CATCHER(reinterpret_cast<jlong>(NULL));
+    } EXCEPTION_CATCHER((jlong)(NULL));
     return reinterpret_cast<jlong>(ramcloud);
 }
 
@@ -474,7 +474,7 @@
 	    check_null(jValue, "NewByteArray failed");
 	    JByteArrayGetter value(env, jValue);
 	    values[i].get()->copy(0, values[i].get()->getTotalLength(), value.pointer);
-	    jobject obj = env->NewObject(jc_RcObject, jm_init, jKey[i], jValue);
+	    jobject obj = env->NewObject(jc_RcObject, jm_init, jKey[i], jValue, (jlong)objects[i].version);
 	    check_null(obj, "NewObject failed");
 	    env->SetObjectArrayElement(outJNIArray, i, obj);
 	}