From 62bea15ec763f09f2a8df1ba4266804b4e8641c3 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Fri, 1 Jul 2022 15:58:16 +0200
Subject: fix(matching): add null-check in custom comperator for address-search
 results

---
 .../auth/eidas/v2/controller/AdresssucheController.java      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'modules/authmodule-eIDAS-v2/src/main/java')

diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
index 4bb1343a..6faa35fd 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
@@ -228,9 +228,15 @@ public class AdresssucheController {
         }
 
         int extractInt(String s) {
-          final String num = s.replaceAll("\\D", "");
-          // return 0 if no digits found
-          return num.isEmpty() ? 0 : Integer.parseInt(num);
+          if (StringUtils.isNotEmpty(s)) {
+            final String num = s.replaceAll("\\D", "");
+            // return 0 if no digits found
+            return num.isEmpty() ? 0 : Integer.parseInt(num);
+          
+          } else {
+            return 0;
+            
+          }
         }
       };
     }
-- 
cgit v1.2.3