浏览代码

Spotbugs: don't doubleCheck Map contains value, just check for null

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 2 年之前
父节点
当前提交
9ae722659f
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java

+ 6 - 4
app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java

@@ -60,11 +60,13 @@ public class WebSocketConnectionHelper {
 
 
     @SuppressLint("LongLogTag")
     @SuppressLint("LongLogTag")
     public static synchronized MagicWebSocketInstance getMagicWebSocketInstanceForUserId(long userId) {
     public static synchronized MagicWebSocketInstance getMagicWebSocketInstanceForUserId(long userId) {
-        if (userId != -1 && magicWebSocketInstanceMap.containsKey(userId)) {
-            return magicWebSocketInstanceMap.get(userId);
+        MagicWebSocketInstance webSocketInstance = magicWebSocketInstanceMap.get(userId);
+
+        if (webSocketInstance == null) {
+            Log.d(TAG, "No magicWebSocketInstance found for user " + userId);
         }
         }
-        Log.d(TAG, "no magicWebSocketInstance found");
-        return null;
+
+        return webSocketInstance;
     }
     }
 
 
     public static synchronized MagicWebSocketInstance getExternalSignalingInstanceForServer(String url,
     public static synchronized MagicWebSocketInstance getExternalSignalingInstanceForServer(String url,