From ece7bc9b2e7069e9267ca6a072b2c61c34db3ca7 Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <matej.sekoranja@cosylab.com>
Date: Tue, 9 Feb 2021 22:33:51 +0100
Subject: [PATCH] beaconHandler lazy initialization fix

---
 .../epics/pvaccess/client/impl/remote/ClientContextImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pvAccessJava/src/org/epics/pvaccess/client/impl/remote/ClientContextImpl.java b/pvAccessJava/src/org/epics/pvaccess/client/impl/remote/ClientContextImpl.java
index 783163032..87d20d48b 100644
--- 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);