From 6ff2e6ecfea5102960093970e2c5b0ed045d545f Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Thu, 23 Apr 2015 22:46:54 -0700 Subject: [PATCH] move findNode method back Signed-off-by: Grant Limberg --- java/jni/ZT1_jniutils.cpp | 10 ---------- java/jni/com_zerotierone_sdk_Node.cpp | 13 ++++++++++++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/java/jni/ZT1_jniutils.cpp b/java/jni/ZT1_jniutils.cpp index 8ec56acfd..72f654477 100644 --- a/java/jni/ZT1_jniutils.cpp +++ b/java/jni/ZT1_jniutils.cpp @@ -50,16 +50,6 @@ jobject createResultObject(JNIEnv *env, ZT1_ResultCode code) return resultObject; } -ZT1_Node* findNode(uint64_t nodeId) -{ - NodeMap::iterator found = nodeMap.find(nodeId); - if(found != nodeMap.end()) - { - JniRef *ref = found->second; - return ref->node; - } - return NULL; -} jobject createVirtualNetworkStatus(JNIEnv *env, ZT1_VirtualNetworkStatus status) { diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp index aad7f642a..e698c0804 100644 --- a/java/jni/com_zerotierone_sdk_Node.cpp +++ b/java/jni/com_zerotierone_sdk_Node.cpp @@ -122,7 +122,18 @@ namespace { } typedef std::map NodeMap; - static NodeMap nodeMap; + static NodeMap nodeMap; + + ZT1_Node* findNode(uint64_t nodeId) + { + NodeMap::iterator found = nodeMap.find(nodeId); + if(found != nodeMap.end()) + { + JniRef *ref = found->second; + return ref->node; + } + return NULL; + } } /*