From e07b9f238e694a8e8f2e665a2677742659e843f6 Mon Sep 17 00:00:00 2001 From: Takahiro Nagao Date: Wed, 16 Jul 2025 16:19:37 +0900 Subject: [PATCH] Fix NullPointerException when obtaining InitialContext Signed-off-by: Takahiro Nagao --- .../com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java index d187635bb1..1f17d902d5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2025 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2020 Oracle and/or its affiliates. * * This program and the accompanying materials are made available under the @@ -68,14 +69,16 @@ public List getClusterInstanceInfo( String[] adapterName) { // Make a copy of the internal data - return new ArrayList( internalClusterInstanceInfo() ) ; + List internalInfo = internalClusterInstanceInfo(); + return internalInfo == null ? new ArrayList<>() : new ArrayList<>(internalInfo); } public List getClusterInstanceInfo( String[] adapterName, List endpoints ) { // Make a copy of the internal data - return new ArrayList( internalClusterInstanceInfo( endpoints ) ) ; + List internalInfo = internalClusterInstanceInfo(endpoints); + return internalInfo == null ? new ArrayList<>() : new ArrayList<>(internalInfo); } @Folb