Return-Path: Delivered-To: apmail-geronimo-xbean-scm-archive@locus.apache.org Received: (qmail 72815 invoked from network); 10 Mar 2007 02:25:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Mar 2007 02:25:46 -0000 Received: (qmail 90356 invoked by uid 500); 10 Mar 2007 02:25:54 -0000 Delivered-To: apmail-geronimo-xbean-scm-archive@geronimo.apache.org Received: (qmail 90339 invoked by uid 500); 10 Mar 2007 02:25:54 -0000 Mailing-List: contact xbean-scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: xbean-scm@geronimo.apache.org Delivered-To: mailing list xbean-scm@geronimo.apache.org Received: (qmail 90330 invoked by uid 99); 10 Mar 2007 02:25:54 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Mar 2007 18:25:54 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Mar 2007 18:25:45 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 4693B1A983E; Fri, 9 Mar 2007 18:25:25 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r516641 - /geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/AbstractContext.java Date: Sat, 10 Mar 2007 02:25:25 -0000 To: xbean-scm@geronimo.apache.org From: dain@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070310022525.4693B1A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dain Date: Fri Mar 9 18:25:24 2007 New Revision: 516641 URL: http://svn.apache.org/viewvc?view=rev&rev=516641 Log: Add simple check for recursive calls Modified: geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/AbstractContext.java Modified: geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/AbstractContext.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/AbstractContext.java?view=diff&rev=516641&r1=516640&r2=516641 ============================================================================== --- geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/AbstractContext.java (original) +++ geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/AbstractContext.java Fri Mar 9 18:25:24 2007 @@ -40,6 +40,7 @@ private final Name parsedNameInNamespace; private final ContextAccess contextAccess; private final boolean modifiable; + private final ThreadLocal inCall = new ThreadLocal(); protected AbstractContext(String nameInNamespace) { this(nameInNamespace, ContextAccess.MODIFIABLE); @@ -171,12 +172,15 @@ * @return the value or null if no fault value could be found */ protected Object faultLookup(String stringName, Name parsedName) { - if (stringName.indexOf(':') > 0) { + if (!stringName.startsWith(nameInNamespace) && stringName.indexOf(':') > 0 && inCall.get() == null) { + inCall.set(parsedName); try { Context ctx = new InitialContext(); return ctx.lookup(parsedName); } catch (NamingException ignored) { // thrown below + } finally { + inCall.set(null); } } return null;