Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 96624 invoked from network); 11 Jul 2009 16:43:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Jul 2009 16:43:09 -0000 Received: (qmail 91033 invoked by uid 500); 11 Jul 2009 16:43:19 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 90972 invoked by uid 500); 11 Jul 2009 16:43:18 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 90963 invoked by uid 99); 11 Jul 2009 16:43:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Jul 2009 16:43:18 +0000 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; Sat, 11 Jul 2009 16:43:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4785D2388882; Sat, 11 Jul 2009 16:42:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r793198 - /felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java Date: Sat, 11 Jul 2009 16:42:56 -0000 To: commits@felix.apache.org From: clement@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090711164256.4785D2388882@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: clement Date: Sat Jul 11 16:42:55 2009 New Revision: 793198 URL: http://svn.apache.org/viewvc?rev=793198&view=rev Log: Fix issue FELIX-1319. The overriding detection badly interpret the 'name' attribute of instance declaration. However, instance declaration must not impact the overriding detected. So, now instances are skipped. Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java?rev=793198&r1=793197&r2=793198&view=diff ============================================================================== --- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java (original) +++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java Sat Jul 11 16:42:55 2009 @@ -294,10 +294,12 @@ if (xml.isAnnotated()) { boolean toskip = false; for (int i = 0; !toskip && i < m_metadata.length; i++) { - if (m_metadata[i].containsAttribute("name") + if (! m_metadata[i].getName().equals("instance") // Only if its a component type definition, + // so skip instance declaration + && m_metadata[i].containsAttribute("name") && m_metadata[i].getAttribute("name").equalsIgnoreCase(xml.getElem().getAttribute("name"))) { toskip = true; - warn("The component " + xml.getElem().getAttribute("name") + " is overriden by the metadata file"); + warn("The component type " + xml.getElem().getAttribute("name") + " is overriden by the metadata file"); } } if (!toskip) {