Repository: ignite Updated Branches: refs/heads/ignite-1282 1133bd13b -> e7b782918
IGNITE-1880: Fixed incorrect local JNI reference handling. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e48abad Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e48abad Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e48abad Branch: refs/heads/ignite-1282 Commit: 9e48abad2cbcf02dbc0c768147f644a21500fd53 Parents: 93b71c7 Author: Pavel Tupitsyn <ptupit...@gridgain.com> Authored: Tue Nov 10 16:12:03 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Nov 10 16:12:03 2015 +0300 ---------------------------------------------------------------------- modules/platforms/cpp/common/include/ignite/common/java.h | 2 +- modules/platforms/cpp/common/src/java.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9e48abad/modules/platforms/cpp/common/include/ignite/common/java.h ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/common/include/ignite/common/java.h b/modules/platforms/cpp/common/include/ignite/common/java.h index 2b2abf9..7a2165c 100644 --- a/modules/platforms/cpp/common/include/ignite/common/java.h +++ b/modules/platforms/cpp/common/include/ignite/common/java.h @@ -529,7 +529,7 @@ namespace ignite void ComputeExecuteNative(jobject obj, long long taskPtr, long long topVer); void ContinuousQueryClose(jobject obj); - void* ContinuousQueryGetInitialQueryCursor(jobject obj); + jobject ContinuousQueryGetInitialQueryCursor(jobject obj); void DataStreamerListenTopology(jobject obj, long long ptr); bool DataStreamerAllowOverwriteGet(jobject obj); http://git-wip-us.apache.org/repos/asf/ignite/blob/9e48abad/modules/platforms/cpp/common/src/java.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/common/src/java.cpp b/modules/platforms/cpp/common/src/java.cpp index a76e035..3a9f70b 100644 --- a/modules/platforms/cpp/common/src/java.cpp +++ b/modules/platforms/cpp/common/src/java.cpp @@ -1507,14 +1507,14 @@ namespace ignite ExceptionCheck(env); } - void* JniContext::ContinuousQueryGetInitialQueryCursor(jobject obj) { + jobject JniContext::ContinuousQueryGetInitialQueryCursor(jobject obj) { JNIEnv* env = Attach(); jobject res = env->CallObjectMethod(obj, jvm->GetMembers().m_PlatformContinuousQuery_getInitialQueryCursor); ExceptionCheck(env); - return res; + return LocalToGlobal(env, res); } void JniContext::DataStreamerListenTopology(jobject obj, long long ptr) { @@ -1889,7 +1889,7 @@ namespace ignite ExceptionCheck(env); - return res; + return LocalToGlobal(env, res);; } long long JniContext::AtomicLongGet(jobject obj)
