DSD-4457 (mosip#72)

* fix cookie without secure code Signed-off-by: mengleang-ngoun <[email protected]> * fix code bug Signed-off-by: mengleang-ngoun <[email protected]> * update sonar ignore on getChache Signed-off-by: mengleang-ngoun <[email protected]> * fix null on message Signed-off-by: mengleang-ngoun <[email protected]> --------- Signed-off-by: mengleang-ngoun <[email protected]>
mengleang-0090 · Mar 27, 2024 · e12a7d7 · e12a7d7
1 parent 9f2052d
commit e12a7d7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/signup-service/src/main/java/io/mosip/signup/services/CacheUtilService.java b/signup-service/src/main/java/io/mosip/signup/services/CacheUtilService.java
@@ -60,11 +60,7 @@ public String setActiveKeyAlias(String key, String alias) {
 
     public RegistrationTransaction createUpdateChallengeGeneratedTransaction(String transactionId,
                                                                        RegistrationTransaction registrationTransaction) {
-<<<<<<< HEAD
         cacheManager.getCache(SignUpConstants.CHALLENGE_GENERATED).put(transactionId, registrationTransaction); //NOSONAR getCache() will not be returning null here.
-=======
-        cacheManager.getCache(SignUpConstants.CHALLENGE_GENERATED).put(transactionId, registrationTransaction);
->>>>>>> f34e20f (Issues with cached methods found during redis integration fixed (#68))
         return registrationTransaction;
     }