BAEL-3855

mguarnaccia · mguarnaccia · commit 22b51db880fd · 2020-03-15T13:04:55.000+01:00
diff --git a/core-java-modules/core-java-concurrency-collections-2/src/main/java/com/baeldung/concurrent/lock/SingleLock.java b/core-java-modules/core-java-concurrency-collections-2/src/main/java/com/baeldung/concurrent/lock/SingleLock.java
@@ -16,23 +16,21 @@ protected Supplier<?> putSupplier(Map<String,String> map, int key) {
         return (()-> {
             try {
                 lock.lock();
-                map.put("key" + key, "value" + key);
+                return map.put("key" + key, "value" + key);
             } finally {
                 lock.unlock();
             }
-            return null;
         });
     }
 
     protected Supplier<?> getSupplier(Map<String,String> map, int key) {
         return (()-> {
             try {
                 lock.lock();
-                map.get("key" + key);
+                return map.get("key" + key);
             } finally {
                 lock.unlock();
             }
-            return null;
         });
     }
 }
diff --git a/core-java-modules/core-java-concurrency-collections-2/src/main/java/com/baeldung/concurrent/lock/StripedLock.java b/core-java-modules/core-java-concurrency-collections-2/src/main/java/com/baeldung/concurrent/lock/StripedLock.java
@@ -19,11 +19,10 @@ protected Supplier<?> putSupplier(Map<String,String> map, int key) {
             Lock lock = stripedLock.get(bucket);
             try {
                 lock.lock();
-                map.put("key" + key, "value" + key);
+                return map.put("key" + key, "value" + key);
             } finally {
                 lock.unlock();
             }
-            return null;
         });
     }
 
@@ -33,11 +32,10 @@ protected Supplier<?> getSupplier(Map<String,String> map, int key) {
             Lock lock = stripedLock.get(bucket);
             try {
                 lock.lock();
-                map.get("key" + key);
+                return map.get("key" + key);
             } finally {
                 lock.unlock();
             }
-            return null;
         });
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,23 +16,21 @@ protected Supplier<?> putSupplier(Map<String,String> map, int key) {`
`16`	`16`	`return (()-> {`
`17`	`17`	`try {`
`18`	`18`	`lock.lock();`
`19`		`- map.put("key" + key, "value" + key);`
	`19`	`+ return map.put("key" + key, "value" + key);`
`20`	`20`	`} finally {`
`21`	`21`	`lock.unlock();`
`22`	`22`	`}`
`23`		`- return null;`
`24`	`23`	`});`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`protected Supplier<?> getSupplier(Map<String,String> map, int key) {`
`28`	`27`	`return (()-> {`
`29`	`28`	`try {`
`30`	`29`	`lock.lock();`
`31`		`- map.get("key" + key);`
	`30`	`+ return map.get("key" + key);`
`32`	`31`	`} finally {`
`33`	`32`	`lock.unlock();`
`34`	`33`	`}`
`35`		`- return null;`
`36`	`34`	`});`
`37`	`35`	`}`
`38`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,10 @@ protected Supplier<?> putSupplier(Map<String,String> map, int key) {`
`19`	`19`	`Lock lock = stripedLock.get(bucket);`
`20`	`20`	`try {`
`21`	`21`	`lock.lock();`
`22`		`- map.put("key" + key, "value" + key);`
	`22`	`+ return map.put("key" + key, "value" + key);`
`23`	`23`	`} finally {`
`24`	`24`	`lock.unlock();`
`25`	`25`	`}`
`26`		`- return null;`
`27`	`26`	`});`
`28`	`27`	`}`
`29`	`28`
`@@ -33,11 +32,10 @@ protected Supplier<?> getSupplier(Map<String,String> map, int key) {`
`33`	`32`	`Lock lock = stripedLock.get(bucket);`
`34`	`33`	`try {`
`35`	`34`	`lock.lock();`
`36`		`- map.get("key" + key);`
	`35`	`+ return map.get("key" + key);`
`37`	`36`	`} finally {`
`38`	`37`	`lock.unlock();`
`39`	`38`	`}`
`40`		`- return null;`
`41`	`39`	`});`
`42`	`40`	`}`
`43`	`41`	`}`