From 826a1ee346975f8c3844b7864ee10842027560f5 Mon Sep 17 00:00:00 2001
From: Brenton Bostick <bostick@gmail.com>
Date: Tue, 15 Aug 2023 10:42:05 -0400
Subject: [PATCH] ANDROID-96: Simplify and use return code from node_init
 directly

---
 java/src/com/zerotier/sdk/Node.java          |  8 ++---
 java/src/com/zerotier/sdk/NodeException.java | 37 --------------------
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 java/src/com/zerotier/sdk/NodeException.java

diff --git a/java/src/com/zerotier/sdk/Node.java b/java/src/com/zerotier/sdk/Node.java
index 7ba269e60..280b5cd50 100644
--- a/java/src/com/zerotier/sdk/Node.java
+++ b/java/src/com/zerotier/sdk/Node.java
@@ -75,8 +75,8 @@ public class Node {
             EventListener eventListener,
             VirtualNetworkFrameListener frameListener,
             VirtualNetworkConfigListener configListener,
-            PathChecker pathChecker) throws NodeException {
-        ResultCode rc = node_init(
+            PathChecker pathChecker) {
+        return node_init(
                 nodeId,
                 getListener,
                 putListener,
@@ -85,10 +85,6 @@ public class Node {
                 frameListener,
                 configListener,
                 pathChecker);
-        if(rc != ResultCode.RESULT_OK) {
-            throw new NodeException(rc.toString());
-        }
-        return rc;
     }
 
     public boolean isInited() {
diff --git a/java/src/com/zerotier/sdk/NodeException.java b/java/src/com/zerotier/sdk/NodeException.java
deleted file mode 100644
index beeb06063..000000000
--- a/java/src/com/zerotier/sdk/NodeException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2015  ZeroTier, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * --
- *
- * ZeroTier may be used and distributed under the terms of the GPLv3, which
- * are available at: http://www.gnu.org/licenses/gpl-3.0.html
- *
- * If you would like to embed ZeroTier into a commercial application or
- * redistribute it in a modified binary form, please contact ZeroTier Networks
- * LLC. Start here: http://www.zerotier.com/
- */
-
-package com.zerotier.sdk;
-
-public class NodeException extends Exception {
-
-    private static final long serialVersionUID = 6268040509883125819L;
-    
-    public NodeException(String message) {
-        super(message);
-    }
-}