Skip to content

Commit db5300a

Browse files
committed
HTTPServer: Fix NullPointerException on connect when handler is not set
1 parent b7c5cda commit db5300a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group = org.threadly
2-
version = 0.21
2+
version = 0.22
33
threadlyVersion = 5.31
44
litesocketsVersion = 4.9
55
org.gradle.parallel=false

server/src/main/java/org/threadly/litesockets/server/http/HTTPServer.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ protected void shutdownService() {
134134
*
135135
* @param handler the handler to use.
136136
*/
137-
public void addHandler(final HTTPServerHandler handler) {
137+
public void setHandler(final HTTPServerHandler handler) {
138138
this.handler = handler;
139139
}
140140

@@ -147,7 +147,7 @@ private class ClientListener implements ClientAcceptor, Reader, ClientCloseListe
147147
@Override
148148
public void accept(Client client) {
149149
TCPClient tclient = (TCPClient)client;
150-
if(handler.onConnection(tclient.getRemoteSocketAddress())) {
150+
if(handler == null || handler.onConnection(tclient.getRemoteSocketAddress())) {
151151
HTTPRequestProcessor hrp = new HTTPRequestProcessor();
152152
hrp.addHTTPRequestCallback(new HTTPRequestListener(tclient));
153153
clients.put(tclient, hrp);
@@ -160,7 +160,10 @@ public void accept(Client client) {
160160

161161
@Override
162162
public void onClose(Client client) {
163-
handler.onDisconnect((InetSocketAddress)client.getRemoteSocketAddress(), client.getStats().getTotalRead(), client.getStats().getTotalWrite());
163+
if (handler != null) {
164+
handler.onDisconnect((InetSocketAddress)client.getRemoteSocketAddress(),
165+
client.getStats().getTotalRead(), client.getStats().getTotalWrite());
166+
}
164167
HTTPRequestProcessor hrp = clients.remove(client);
165168
if(hrp != null) {
166169
hrp.connectionClosed();

0 commit comments

Comments
 (0)