diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-09-07 11:20:47 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-09-07 11:20:47 -0700 |
| commit | a9f404aac344e5d07278a684b224df74e2529afe (patch) | |
| tree | abf79f76f2c1d4cd22bbd263809238d55295b0f4 /java | |
| parent | ff9f8b1c2b12cf11205a040748cbc9f223a67e19 (diff) | |
| parent | 407ad659eab4314764310e2c9d274e73147f6034 (diff) | |
| download | infinitytier-a9f404aac344e5d07278a684b224df74e2529afe.tar.gz infinitytier-a9f404aac344e5d07278a684b224df74e2529afe.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'java')
| -rw-r--r-- | java/jni/ZT_jniutils.cpp | 9 | ||||
| -rw-r--r-- | java/src/com/zerotier/sdk/PeerPhysicalPath.java | 8 |
2 files changed, 0 insertions, 17 deletions
diff --git a/java/jni/ZT_jniutils.cpp b/java/jni/ZT_jniutils.cpp index d7d205a7..f73c408b 100644 --- a/java/jni/ZT_jniutils.cpp +++ b/java/jni/ZT_jniutils.cpp @@ -371,7 +371,6 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp) jfieldID addressField = NULL; jfieldID lastSendField = NULL; jfieldID lastReceiveField = NULL; - jfieldID activeField = NULL; jfieldID preferredField = NULL; jmethodID ppp_constructor = NULL; @@ -404,13 +403,6 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp) return NULL; } - activeField = lookup.findField(pppClass, "active", "Z"); - if(env->ExceptionCheck() || activeField == NULL) - { - LOGE("Error finding active field"); - return NULL; - } - preferredField = lookup.findField(pppClass, "preferred", "Z"); if(env->ExceptionCheck() || preferredField == NULL) { @@ -441,7 +433,6 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp) env->SetObjectField(pppObject, addressField, addressObject); env->SetLongField(pppObject, lastSendField, ppp.lastSend); env->SetLongField(pppObject, lastReceiveField, ppp.lastReceive); - env->SetBooleanField(pppObject, activeField, ppp.active); env->SetBooleanField(pppObject, preferredField, ppp.preferred); if(env->ExceptionCheck()) { diff --git a/java/src/com/zerotier/sdk/PeerPhysicalPath.java b/java/src/com/zerotier/sdk/PeerPhysicalPath.java index d64ea56b..3f9a8612 100644 --- a/java/src/com/zerotier/sdk/PeerPhysicalPath.java +++ b/java/src/com/zerotier/sdk/PeerPhysicalPath.java @@ -37,7 +37,6 @@ public final class PeerPhysicalPath { private long lastSend; private long lastReceive; private boolean fixed; - private boolean active; private boolean preferred; private PeerPhysicalPath() {} @@ -71,13 +70,6 @@ public final class PeerPhysicalPath { } /** - * Is path active? - */ - public final boolean isActive() { - return active; - } - - /** * Is path preferred? */ public final boolean isPreferred() { |