From e1c16a8e68beddba7b57557e9350994a55a0e4a7 Mon Sep 17 00:00:00 2001
From: Brenton Bostick <bostick@gmail.com>
Date: Wed, 1 Feb 2023 11:19:01 -0500
Subject: [PATCH] invert logic in a couple of places and return early

---
 java/jni/ZT_jniutils.cpp              | 18 +++++++-----------
 java/jni/com_zerotierone_sdk_Node.cpp |  9 +++++----
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/java/jni/ZT_jniutils.cpp b/java/jni/ZT_jniutils.cpp
index 86e4fdcb8..44191b81e 100644
--- a/java/jni/ZT_jniutils.cpp
+++ b/java/jni/ZT_jniutils.cpp
@@ -175,20 +175,16 @@ jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr)
 {
     LOGV("newInetSocketAddress Called");
 
-    jobject inetAddressObject = NULL;
-
-    if(addr.ss_family != 0)
+    if(addr.ss_family == 0)
     {
-        inetAddressObject = newInetAddress(env, addr);
-
-        if(env->ExceptionCheck() || inetAddressObject == NULL)
-        {
-            LOGE("Error creating new inet address");
-            return NULL;
-        }
+        return NULL;
     }
-    else
+
+    jobject inetAddressObject = newInetAddress(env, addr);
+
+    if(env->ExceptionCheck() || inetAddressObject == NULL)
     {
+        LOGE("Error creating new inet address");
         return NULL;
     }
 
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index 28a5ed5b9..9b0a309a0 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -233,11 +233,12 @@ namespace {
             case ZT_EVENT_TRACE: {
                 LOGV("Trace Event");
                 // call onTrace()
-                if (data != NULL) {
-                    const char *message = (const char *) data;
-                    jstring messageStr = env->NewStringUTF(message);
-                    env->CallVoidMethod(ref->eventListener, EventListener_onTrace_method, messageStr);
+                if (data == NULL) {
+                    break;
                 }
+                const char *message = (const char *) data;
+                jstring messageStr = env->NewStringUTF(message);
+                env->CallVoidMethod(ref->eventListener, EventListener_onTrace_method, messageStr);
             }
                 break;
             case ZT_EVENT_USER_MESSAGE: