Merge pull request #342 from iExecBlockchainComputing/fix

Ugo Plouviez · web-flow · commit 2550cb5aae0a · 2019-12-02T13:45:16.000+01:00
Safe delete from EIP712 challenge expiring map
diff --git a/src/main/java/com/iexec/core/result/repo/proxy/Eip712ChallengeService.java b/src/main/java/com/iexec/core/result/repo/proxy/Eip712ChallengeService.java
@@ -9,7 +9,6 @@
 import org.springframework.stereotype.Service;
 
 import java.security.SecureRandom;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 @Service
@@ -50,11 +49,7 @@ boolean containsEip712ChallengeString(String eip712ChallengeString) {
     }
 
     void invalidateEip712ChallengeString(String eip712ChallengeString) {
-        for (Map.Entry<Integer, String> entry : challengeMap.entrySet()) {
-            if (entry.getValue().equals(eip712ChallengeString)) {
-                challengeMap.remove(entry.getKey());
-            }
-        }
+        challengeMap.entrySet().removeIf(entry -> entry.getValue().equals(eip712ChallengeString));
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`import org.springframework.stereotype.Service;`
`10`	`10`
`11`	`11`	`import java.security.SecureRandom;`
`12`		`-import java.util.Map;`
`13`	`12`	`import java.util.concurrent.TimeUnit;`
`14`	`13`
`15`	`14`	`@Service`
`@@ -50,11 +49,7 @@ boolean containsEip712ChallengeString(String eip712ChallengeString) {`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`void invalidateEip712ChallengeString(String eip712ChallengeString) {`
`53`		`- for (Map.Entry<Integer, String> entry : challengeMap.entrySet()) {`
`54`		`- if (entry.getValue().equals(eip712ChallengeString)) {`
`55`		`- challengeMap.remove(entry.getKey());`
`56`		`- }`
`57`		`- }`
	`52`	`+ challengeMap.entrySet().removeIf(entry -> entry.getValue().equals(eip712ChallengeString));`
`58`	`53`	`}`
`59`	`54`
`60`	`55`	`}`