Avoids NullPointerException when shutting down PVAServer

ControlSystemStudio · Nov 15, 2023 · cdd521d · cdd521d
1 parent 0ed38e3
commit cdd521d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/pva/src/main/java/org/epics/pva/server/ServerTCPHandler.java b/core/pva/src/main/java/org/epics/pva/server/ServerTCPHandler.java
@@ -12,6 +12,7 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.ByteBuffer;
+import java.util.Objects;
 import java.util.logging.Level;
 
 import org.epics.pva.common.CommandHandlers;
@@ -62,7 +63,7 @@ class ServerTCPHandler extends TCPHandler
     public ServerTCPHandler(final PVAServer server, final Socket client, final TLSHandshakeInfo tls_info) throws Exception
     {
         super(client, false);
-        this.server = server;
+        this.server = Objects.requireNonNull(server);
         this.tls_info = tls_info;
 
         server.register(this);

diff --git a/core/pva/src/main/java/org/epics/pva/server/ServerTCPListener.java b/core/pva/src/main/java/org/epics/pva/server/ServerTCPListener.java
@@ -15,6 +15,7 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
+import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -57,7 +58,7 @@ class ServerTCPListener
 
     public ServerTCPListener(final PVAServer server) throws Exception
     {
-        this.server = server;
+        this.server = Objects.requireNonNull(server);
 
         // Is TLS configured?
         final boolean tls = !PVASettings.EPICS_PVAS_TLS_KEYCHAIN.isBlank();