Added yet another fix to almost same problem

developerfromjokela · developerfromjokela · commit 53f8e59b2bbf · 2020-10-12T18:13:31.000+03:00
diff --git a/src/main/java/com/developerfromjokela/edison/web/rpc/server/CommunicationServer.java b/src/main/java/com/developerfromjokela/edison/web/rpc/server/CommunicationServer.java
@@ -48,7 +48,7 @@ public WebSocket getWebClientByLoginId(String loginId) {
 	public WebSocket getWebClientByUserID(String uuid, String loginId) {
 		for (WebSocket socket : getConnections()) {
 			ClientDetails details = socket.getAttachment();
-			if (details.getClientType().equals(ClientDetails.TYPE_APP) && details.getCurrentLoginProcess().equals(loginId) && details.getUuid().equals(uuid)) {
+			if (details.getClientType().equals(ClientDetails.TYPE_APP) && (details.getCurrentLoginProcess() != null && details.getCurrentLoginProcess().equals(loginId)) && details.getUuid().equals(uuid)) {
 				return socket;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public WebSocket getWebClientByLoginId(String loginId) {`
`48`	`48`	`public WebSocket getWebClientByUserID(String uuid, String loginId) {`
`49`	`49`	`for (WebSocket socket : getConnections()) {`
`50`	`50`	`ClientDetails details = socket.getAttachment();`
`51`		`- if (details.getClientType().equals(ClientDetails.TYPE_APP) && details.getCurrentLoginProcess().equals(loginId) && details.getUuid().equals(uuid)) {`
	`51`	`+ if (details.getClientType().equals(ClientDetails.TYPE_APP) && (details.getCurrentLoginProcess() != null && details.getCurrentLoginProcess().equals(loginId)) && details.getUuid().equals(uuid)) {`
`52`	`52`	`return socket;`
`53`	`53`	`}`
`54`	`54`	`}`