JavaIsJavaScript
diff --git a/‎src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java‎
Lines changed: 2 additions & 8 deletions b/‎src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java‎
Lines changed: 2 additions & 8 deletions
@@ -41,15 +41,9 @@ public SessionContextStoreImpl(WsSessionSelectStrategy wsSessionSelectStrategy)
     public void add(String chargeBoxId, WebSocketSession session, ScheduledFuture pingSchedule) {
         SessionContext context = new SessionContext(session, pingSchedule, DateTime.now());
 
-        Deque<SessionContext> endpointDeque = lookupTable.get(chargeBoxId);
-        if (endpointDeque == null) {
-            final Deque<SessionContext> emptyDeque = new ArrayDeque<>();
-            endpointDeque = lookupTable.putIfAbsent(chargeBoxId, emptyDeque);
-            if (endpointDeque == null) {
-                endpointDeque = emptyDeque;
-            }
-        }
+        Deque<SessionContext> endpointDeque = lookupTable.computeIfAbsent(chargeBoxId, str -> new ArrayDeque<>());
         endpointDeque.addLast(context); // Adding at the end
+
         log.debug("A new SessionContext is stored for chargeBoxId '{}'. Store size: {}",
                 chargeBoxId, endpointDeque.size());
     }