Merge pull request #115 from msekoranja/master

shroffk · web-flow · commit 3a32ca5dbc2f · 2021-02-16T09:37:10.000-05:00
beaconHandler lazy initialization fix
diff --git a/pvAccessJava/src/org/epics/pvaccess/client/impl/remote/ClientContextImpl.java b/pvAccessJava/src/org/epics/pvaccess/client/impl/remote/ClientContextImpl.java
@@ -1023,7 +1023,7 @@ public BeaconHandler getBeaconHandler(String protocol, InetSocketAddress respons
 			Map<InetSocketAddress, BeaconHandlerImpl> protocolBeaconHandlersMap = beaconHandlers.get(protocol);
 			if (protocolBeaconHandlersMap == null) {
 				protocolBeaconHandlersMap = new HashMap<InetSocketAddress, BeaconHandlerImpl>();
-				beaconHandlers.get(protocolBeaconHandlersMap);
+				beaconHandlers.put(protocol, protocolBeaconHandlersMap);
 			}
 
 			BeaconHandlerImpl handler = protocolBeaconHandlersMap.get(responseFrom);

Original file line number	Diff line number	Diff line change
`@@ -1023,7 +1023,7 @@ public BeaconHandler getBeaconHandler(String protocol, InetSocketAddress respons`
`1023`	`1023`	`Map<InetSocketAddress, BeaconHandlerImpl> protocolBeaconHandlersMap = beaconHandlers.get(protocol);`
`1024`	`1024`	`if (protocolBeaconHandlersMap == null) {`
`1025`	`1025`	`protocolBeaconHandlersMap = new HashMap<InetSocketAddress, BeaconHandlerImpl>();`
`1026`		`- beaconHandlers.get(protocolBeaconHandlersMap);`
	`1026`	`+ beaconHandlers.put(protocol, protocolBeaconHandlersMap);`
`1027`	`1027`	`}`
`1028`	`1028`
`1029`	`1029`	`BeaconHandlerImpl handler = protocolBeaconHandlersMap.get(responseFrom);`