From 22baf7b1f4c1a6a5aeb40499512132a34be14420 Mon Sep 17 00:00:00 2001
From: Pankaj Godiyal <pankaj.godiyal@technoforte.co.in>
Date: Wed, 8 Nov 2023 12:35:31 +0530
Subject: [PATCH] MOSIP-28970

Signed-off-by: Pankaj Godiyal <pankaj.godiyal@technoforte.co.in>
---
 MockMDS/pom.xml                               |  2 +-
 .../sbi/devicehelper/SBIDeviceHelper.java     | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/MockMDS/pom.xml b/MockMDS/pom.xml
index 447d9bdd..1502147a 100644
--- a/MockMDS/pom.xml
+++ b/MockMDS/pom.xml
@@ -12,7 +12,7 @@
 	
 	<groupId>io.mosip.mock.mds</groupId>
 	<artifactId>mock-mds</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<name>mock-mds</name>
 	<description>A mock project for biometric provider</description>
 
diff --git a/MockMDS/src/main/java/io/mosip/mock/sbi/devicehelper/SBIDeviceHelper.java b/MockMDS/src/main/java/io/mosip/mock/sbi/devicehelper/SBIDeviceHelper.java
index 7d2e180e..eb397fc0 100644
--- a/MockMDS/src/main/java/io/mosip/mock/sbi/devicehelper/SBIDeviceHelper.java
+++ b/MockMDS/src/main/java/io/mosip/mock/sbi/devicehelper/SBIDeviceHelper.java
@@ -10,6 +10,7 @@
 import java.security.cert.X509Certificate;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -818,8 +819,22 @@ private void loadKeys(String keyStoreFileName, String alias, String keystorePass
 	 * To be invoked in afterSuite
 	 * @param keystoreFilePath
 	 */
-	public static void evictKeys(String keystoreFilePath) {
-		privateKeyMap.entrySet().removeIf( e -> e.getKey().startsWith(keystoreFilePath));
-		certificateMap.entrySet().removeIf( e -> e.getKey().startsWith(keystoreFilePath));
+
+	
+	public static boolean evictKeys(String keystoreFilePath) {
+		boolean bKeyFound = false;
+		for (Entry<String, PrivateKey> entry : privateKeyMap.entrySet()) {
+			if (entry.getKey().startsWith(keystoreFilePath)) {
+				bKeyFound = true;
+				break;
+			}
+		}
+		if (bKeyFound == false)
+			return true; // No key to remove
+		boolean bRetVal = privateKeyMap.entrySet().removeIf(e -> e.getKey().startsWith(keystoreFilePath));
+		if (bRetVal) {
+			bRetVal = certificateMap.entrySet().removeIf(e -> e.getKey().startsWith(keystoreFilePath));
+		}
+		return bRetVal;
 	}
 }