From 5d87e61cdb4f0aabe5c4c11b0aa199aa85c1e604 Mon Sep 17 00:00:00 2001 From: Justin James Date: Wed, 8 Jan 2025 17:48:25 -0500 Subject: [PATCH] [irods-contrib/metalnx-web#133] disconnect from protocol when InvalidUserException is encountered --- .../connection/AbstractIRODSMidLevelProtocolFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jargon-core/src/main/java/org/irods/jargon/core/connection/AbstractIRODSMidLevelProtocolFactory.java b/jargon-core/src/main/java/org/irods/jargon/core/connection/AbstractIRODSMidLevelProtocolFactory.java index ae10959d2..05e211890 100644 --- a/jargon-core/src/main/java/org/irods/jargon/core/connection/AbstractIRODSMidLevelProtocolFactory.java +++ b/jargon-core/src/main/java/org/irods/jargon/core/connection/AbstractIRODSMidLevelProtocolFactory.java @@ -4,6 +4,7 @@ package org.irods.jargon.core.connection; import org.irods.jargon.core.exception.AuthenticationException; +import org.irods.jargon.core.exception.InvalidUserException; import org.irods.jargon.core.exception.JargonException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -95,12 +96,11 @@ protected IRODSMidLevelProtocol instance(final IRODSSession irodsSession, final protocol = authenticate(protocol, irodsAccount, irodsSession, irodsProtocolManager); log.debug("..authenticated...now decorate and return..."); return decorate(protocol, irodsAccount, irodsSession); - } catch (AuthenticationException e) { + } catch (InvalidUserException | AuthenticationException e) { log.warn("auth failure, be sure to abandon agent)", e); protocol.disconnectWithForce(); throw e; - } - + } } /**