RATIS-2336. PeerProxyMap.getProxy() could return null. (#1290)

szetszwo · web-flow · commit e26213a711b3 · 2025-09-24T09:38:15.000-07:00
diff --git a/ratis-common/src/main/java/org/apache/ratis/util/PeerProxyMap.java b/ratis-common/src/main/java/org/apache/ratis/util/PeerProxyMap.java
@@ -59,7 +59,10 @@ RaftPeer getPeer() {
     }
 
     PROXY getProxy() throws IOException {
-      if (proxy == null) {
+      final PROXY p = proxy;
+      if (p != null) {
+        return p;
+      } else {
         synchronized (this) {
           if (proxy == null) {
             final LifeCycle.State current = lifeCycle.getCurrentState();
@@ -69,9 +72,9 @@ PROXY getProxy() throws IOException {
             lifeCycle.startAndTransition(
                 () -> proxy = createProxyImpl(peer), IOException.class);
           }
+          return Objects.requireNonNull(proxy, "proxy");
         }
       }
-      return proxy;
     }
 
     Optional<PROXY> setNullProxyAndClose() {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,10 @@ RaftPeer getPeer() {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`PROXY getProxy() throws IOException {`
`62`		`- if (proxy == null) {`
	`62`	`+ final PROXY p = proxy;`
	`63`	`+ if (p != null) {`
	`64`	`+ return p;`
	`65`	`+ } else {`
`63`	`66`	`synchronized (this) {`
`64`	`67`	`if (proxy == null) {`
`65`	`68`	`final LifeCycle.State current = lifeCycle.getCurrentState();`
`@@ -69,9 +72,9 @@ PROXY getProxy() throws IOException {`
`69`	`72`	`lifeCycle.startAndTransition(`
`70`	`73`	`() -> proxy = createProxyImpl(peer), IOException.class);`
`71`	`74`	`}`
	`75`	`+ return Objects.requireNonNull(proxy, "proxy");`
`72`	`76`	`}`
`73`	`77`	`}`
`74`		`- return proxy;`
`75`	`78`	`}`
`76`	`79`
`77`	`80`	`Optional<PROXY> setNullProxyAndClose() {`