Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 55017 invoked from network); 6 May 2010 07:24:48 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 May 2010 07:24:48 -0000 Received: (qmail 64561 invoked by uid 500); 6 May 2010 07:24:48 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 64506 invoked by uid 500); 6 May 2010 07:24:47 -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 64494 invoked by uid 99); 6 May 2010 07:24:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 May 2010 07:24:47 +0000 X-ASF-Spam-Status: No, hits=-1393.1 required=10.0 tests=ALL_TRUSTED,AWL 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; Thu, 06 May 2010 07:24:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C198423888E4; Thu, 6 May 2010 07:23:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r941594 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java Date: Thu, 06 May 2010 07:23:56 -0000 To: commits@felix.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100506072356.C198423888E4@eris.apache.org> Author: fmeschbe Date: Thu May 6 07:23:56 2010 New Revision: 941594 URL: http://svn.apache.org/viewvc?rev=941594&view=rev Log: FELIX-2325 Return the implementation class name from the getName method if the component name has not been explicitly set with the name attribute. Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java?rev=941594&r1=941593&r2=941594&view=diff ============================================================================== --- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java (original) +++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java Thu May 6 07:23:56 2010 @@ -381,7 +381,19 @@ public class ComponentMetadata */ public String getName() { - return m_name; + // FELIX-2325: Be lenient here and return the name if set or + // the implementation class name. This allows for the + // BundleComponentActivator.loadComponents method to access the + // name before validating the component, which then makes sure + // that the name may only be unset for DS 1.1 and newer components + + if ( m_name != null ) + { + return m_name; + } + + // return the implementation class name if the name is not set + return getImplementationClassName(); }