From 818fd2f769c5fda9e18c4176be6a437be65d6bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Fri, 1 May 2026 02:45:51 +0200 Subject: [PATCH] Fixed exception caused by the log - orb getters are not getters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - some do also checks and throw exceptions, see configData.getPersistentServerId() Signed-off-by: David Matějček --- .../com/sun/corba/ee/impl/orb/ORBImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBImpl.java index 4831bc5eca..75d05dcbec 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBImpl.java @@ -1764,24 +1764,24 @@ private boolean isLocalHost(InetAddress address) { @Override @Subcontract - public boolean isLocalServerId( int subcontractId, int serverId ) - { + public boolean isLocalServerId(int subcontractId, int serverId) { + final int psid; if (subcontractDebugFlag) { - int psid = -1; if (configData.getPersistentServerIdInitialized()) { psid = configData.getPersistentServerId(); + } else { + psid = -1; } - - isLocalServerIdInfo( subcontractId, serverId, - getTransientServerId(), - ORBConstants.isTransient(subcontractId), - configData.getPersistentServerIdInitialized(), psid ) ; + isLocalServerIdInfo(subcontractId, serverId, getTransientServerId(), + ORBConstants.isTransient(subcontractId), configData.getPersistentServerIdInitialized(), psid); + } else { + psid = -1; } - LOG.log(DEBUG, "isLocalServerId: params[subcontractId={0}, serverId={1}], mystate[transientServerId={2}," - + " persistentServerId={3}, persistentServerIdInitialized={4}]", - subcontractId, serverId, getTransientServerId(), - configData.getPersistentServerId(), configData.getPersistentServerIdInitialized()); + LOG.log(TRACE, + () -> "isLocalServerId: params[subcontractId=" + subcontractId + ", serverId=" + serverId + + "], mystate[transientServerId=" + transientServerId + "," + " persistentServerId=" + psid + + ", persistentServerIdInitialized=" + configData.getPersistentServerIdInitialized() + "]"); if (subcontractId < ORBConstants.FIRST_POA_SCID || subcontractId > ORBConstants.MAX_POA_SCID) { return serverId == getTransientServerId();