Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 76100 invoked from network); 27 Aug 2008 12:12:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Aug 2008 12:12:03 -0000 Received: (qmail 65058 invoked by uid 500); 27 Aug 2008 12:12:01 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 65011 invoked by uid 500); 27 Aug 2008 12:12:01 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 65002 invoked by uid 99); 27 Aug 2008 12:12:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Aug 2008 05:12:01 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Aug 2008 12:11:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9381E238898F; Wed, 27 Aug 2008 05:11:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r689454 - /ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java Date: Wed, 27 Aug 2008 12:11:12 -0000 To: notifications@ant.apache.org From: xavier@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080827121112.9381E238898F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xavier Date: Wed Aug 27 05:11:12 2008 New Revision: 689454 URL: http://svn.apache.org/viewvc?rev=689454&view=rev Log: FIX: yet another bug introduced when implementing IVY-886 Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java?rev=689454&r1=689453&r2=689454&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java Wed Aug 27 05:11:12 2008 @@ -451,7 +451,7 @@ } protected void convertM2TokenValuesForResourceSearch(Map tokenValues) { - if (tokenValues.containsKey(IvyPatternHelper.ORGANISATION_KEY)) { + if (tokenValues.get(IvyPatternHelper.ORGANISATION_KEY) instanceof String) { tokenValues.put(IvyPatternHelper.ORGANISATION_KEY, convertM2OrganizationForResourceSearch( (String) tokenValues.get(IvyPatternHelper.ORGANISATION_KEY)));