Fix potential NPE

ME1312 · Apr 10, 2022 · ce262c6 · ce262c6
1 parent e4300e7
commit ce262c6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java
@@ -70,10 +70,10 @@ public void receive(SubDataClient client, ObjectMap<Integer> data) {
                         queue(host.getName(), () -> client.sendPacket(new PacketLinkExHost(0, null)));
                         setReady(client);
                     } else {
-                        client.sendPacket(new PacketLinkExHost(3, "Host already linked"));
+                        client.sendPacket(new PacketLinkExHost(3, "Host already linked: " + data.getString(0x0000)));
                     }
                 } else {
-                    client.sendPacket(new PacketLinkExHost(4, "That host does not support a network interface"));
+                    client.sendPacket(new PacketLinkExHost(4, "Requested host does not support network interfaces: " + data.getString(0x0000)));
                 }
             } else {
                 client.sendPacket(new PacketLinkExHost(2, "There is no host with name: " + data.getString(0x0000)));

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java
@@ -81,7 +81,7 @@ public void receive(SubDataClient client, ObjectMap<Integer> data) {
                 queue(proxy.getName(), () -> client.sendPacket(new PacketLinkProxy(proxy.getName(), 0, null)));
                 setReady(client);
             } else {
-                client.sendPacket(new PacketLinkProxy(proxy.getName(), 2, "Proxy already linked"));
+                client.sendPacket(new PacketLinkProxy(null, 2, "Proxy already linked: " + proxy.getName()));
 
             }
         } catch (Throwable e) {

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java
@@ -176,7 +176,7 @@ public void run() {
             last = now;
             setReady(client);
         } else {
-            client.sendPacket(new PacketLinkServer(null, 4, "Server already linked"));
+            client.sendPacket(new PacketLinkServer(null, 4, "Server already linked: " + server.getName()));
         }
     }
 }
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServerImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServerImpl.java
@@ -98,6 +98,7 @@ public SubServerImpl(ExHost host, String name, boolean enabled, int port, boolea
 
     private void run() {
         boolean falsestart = true;
+        int exit = Integer.MIN_VALUE;
         allowrestart = true;
         try {
             ProcessBuilder pb = new ProcessBuilder().command(Executable.parse(host.host.getString("Git-Bash"), executable)).directory(directory);
@@ -121,15 +122,16 @@ private void run() {
             queue.clear();
 
             if (process.isAlive()) process.waitFor();
+            exit = process.exitValue();
         } catch (IOException | InterruptedException e) {
             host.log.error.println(e);
             allowrestart = false;
             if (falsestart) ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketExControlServer(this, Response.LAUNCH_EXCEPTION));
         }
 
         logger.destroy();
-        if (SubAPI.getInstance().getSubDataNetwork()[0] != null) {
-            ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketExControlServer(this, Response.STOPPED, (Integer) process.exitValue(), (Boolean) allowrestart));
+        if (SubAPI.getInstance().getSubDataNetwork()[0] != null) { // noinspection UnnecessaryBoxing
+            ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketExControlServer(this, Response.STOPPED, Integer.valueOf(exit), Boolean.valueOf(allowrestart)));
         }
         host.log.info.println(name + " has stopped");
         process = null;