Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 9907 invoked from network); 22 Aug 2010 11:33:22 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Aug 2010 11:33:22 -0000 Received: (qmail 98582 invoked by uid 500); 22 Aug 2010 11:33:22 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 98493 invoked by uid 500); 22 Aug 2010 11:33: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 98486 invoked by uid 99); 22 Aug 2010 11:33:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Aug 2010 11:33:17 +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; Sun, 22 Aug 2010 11:33:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3FD8D2388978; Sun, 22 Aug 2010 11:31:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r987867 - /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java Date: Sun, 22 Aug 2010 11:31:57 -0000 To: commits@felix.apache.org From: pderop@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100822113157.3FD8D2388978@eris.apache.org> Author: pderop Date: Sun Aug 22 11:31:56 2010 New Revision: 987867 URL: http://svn.apache.org/viewvc?rev=987867&view=rev Log: fixed initialization of the ResourceDependency with respect to propagate parameters. This fix is validated by the ResourceAdapterServiceTestWithPublisher testcase Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java?rev=987867&r1=987866&r2=987867&view=diff ============================================================================== --- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java (original) +++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ResourceAdapterServiceImpl.java Sun Aug 22 11:31:56 2010 @@ -100,12 +100,14 @@ public class ResourceAdapterServiceImpl dependencies.remove(0); ResourceDependency resourceDependency = m_manager.createResourceDependency() .setResource(resource) - .setPropagate(m_propagate) .setCallbacks(m_callbackInstance, null, m_callbackChanged, null) .setAutoConfig(true) .setRequired(true); - resourceDependency.setPropagate(m_propagate); - resourceDependency.setPropagate(m_propagateCallbackInstance, m_propagateCallbackMethod); + if (m_propagateCallbackInstance != null && m_propagateCallbackMethod != null) { + resourceDependency.setPropagate(m_propagateCallbackInstance, m_propagateCallbackMethod); + } else { + resourceDependency.setPropagate(m_propagate); + } Service service = m_manager.createService() .setInterface(m_serviceInterfaces, props) .setImplementation(m_serviceImpl)