From 458cc9486e5bc513a06d1ad8a3aba1c535e23721 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Tue, 2 Nov 2021 13:55:21 +0100
Subject: [PATCH] SEBSERV-238

---
 .../session/impl/SEBClientConnectionServiceImpl.java           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
index 679da882..0e476e64 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
@@ -267,7 +267,8 @@ public class SEBClientConnectionServiceImpl implements SEBClientConnectionServic
 
             // connection integrity check
             if (clientConnection.status == ConnectionStatus.ACTIVE) {
-                if (clientConnection.clientAddress != null && clientConnection.clientAddress.equals(clientAddress)) {
+                if (clientConnection.clientAddress != null &&
+                        (StringUtils.isBlank(clientAddress) || clientConnection.clientAddress.equals(clientAddress))) {
                     // It seems that this is the same SEB that tries to establish the connection once again.
                     // Just log this and return already established connection
                     if (log.isDebugEnabled()) {