From c342dcdbdd9ae8c7563b7e338bf32b5f5617d0d4 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Thu, 19 May 2022 13:53:46 +0200
Subject: [PATCH] SEBSERV-240 fixed

---
 .../weblayer/api/ClientConnectionController.java     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientConnectionController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientConnectionController.java
index bed39fc5..8973f4cd 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientConnectionController.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientConnectionController.java
@@ -20,6 +20,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.springframework.http.MediaType;
@@ -290,16 +291,13 @@ public class ClientConnectionController extends ReadonlyEntityController<ClientC
         public int compare(final ClientConnection cc1, final ClientConnection cc2) {
             int result = 0;
             if (Domain.CLIENT_CONNECTION.ATTR_EXAM_USER_SESSION_ID.equals(this.sortColumn)) {
-                result = cc1.userSessionId
-                        .compareTo(cc2.userSessionId);
+                result = ObjectUtils.compare(cc1.userSessionId, cc2.userSessionId);
             } else if (ClientConnection.ATTR_INFO.equals(this.sortColumn)) {
-                result = cc1.getInfo().compareTo(cc2.getInfo());
+                result = ObjectUtils.compare(cc1.getInfo(), cc2.getInfo());
             } else if (Domain.CLIENT_CONNECTION.ATTR_STATUS.equals(this.sortColumn)) {
-                result = cc1.getStatus()
-                        .compareTo(cc2.getStatus());
+                result = ObjectUtils.compare(cc1.getStatus(), cc2.getStatus());
             } else {
-                result = cc1.userSessionId
-                        .compareTo(cc2.userSessionId);
+                result = ObjectUtils.compare(cc1.userSessionId, cc2.userSessionId);
             }
             return (this.descending) ? -result : result;
         }