# HG changeset patch # User vtewari # Date 1535532019 -19800 # Node ID 0f8e680269d4683ece93f3c68a3301e9c92ddbc2 # Parent de411d537aae8ca5508c87c15f364f934b235a60 8176553: LdapContext follows referrals infinitely ignoring set limit Reviewed-by: chegar Contributed-by: jkalina@redhat.com diff -r de411d537aae -r 0f8e680269d4 src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java --- a/src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java Wed Aug 29 09:36:17 2018 +0200 +++ b/src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java Wed Aug 29 14:10:19 2018 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -312,7 +312,8 @@ if ((refEx != null) && (refEx.hasMoreReferrals() || - refEx.hasMoreReferralExceptions())) { + refEx.hasMoreReferralExceptions() + && !(errEx instanceof LimitExceededException))) { if (homeCtx.handleReferrals == LdapClient.LDAP_REF_THROW) { throw (NamingException)(refEx.fillInStackTrace());