From f90490656204d0ac4d375fc2e3df9e54ea15e3a3 Mon Sep 17 00:00:00 2001
From: Mike Hansen <mike.hansen@connectus.ai>
Date: Tue, 30 Jun 2020 14:39:13 -0400
Subject: [PATCH] Client Session update handling, only for client entries
 without null values

---
 .../integration/OpensyncExternalIntegrationCloud.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java
index 62a5da1..26a6e23 100644
--- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java
+++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java
@@ -1273,7 +1273,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             }
 
             ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId,
-                    clientInstance.getMacAddress());
+                    new MacAddress(client.getMacAddress()));
             // For this session if we have a disconnected client, remove, else
             // update
             if (!client.getConnected()) {
@@ -1291,7 +1291,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                     clientSession.setCustomerId(customerId);
                     clientSession.setEquipmentId(equipmentId);
                     clientSession.setLocationId(locationId);
-                    clientSession.setMacAddress(clientInstance.getMacAddress());
+                    clientSession.setMacAddress(new MacAddress(client.getMacAddress()));
 
                     ClientSessionDetails clientSessionDetails = new ClientSessionDetails();
                     clientSessionDetails.setAssocTimestamp(timestamp - client.getConnectOffsetMs());