Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 34BDC726A for ; Wed, 21 Dec 2011 23:08:03 +0000 (UTC) Received: (qmail 27778 invoked by uid 500); 21 Dec 2011 23:08:03 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 27728 invoked by uid 500); 21 Dec 2011 23:08:03 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 27719 invoked by uid 99); 21 Dec 2011 23:08:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2011 23:08:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 21 Dec 2011 23:08:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4C68923889DA for ; Wed, 21 Dec 2011 23:07:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1221933 - /cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManager.java Date: Wed, 21 Dec 2011 23:07:39 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111221230739.4C68923889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Wed Dec 21 23:07:38 2011 New Revision: 1221933 URL: http://svn.apache.org/viewvc?rev=1221933&view=rev Log: [DOSGI-76] Applying a patch on behalf of Marco Mauri Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManager.java Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManager.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManager.java?rev=1221933&r1=1221932&r2=1221933&view=diff ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManager.java (original) +++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManager.java Wed Dec 21 23:07:38 2011 @@ -18,7 +18,6 @@ */ package org.apache.cxf.dosgi.topologymanager; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Dictionary; @@ -42,7 +41,6 @@ import org.osgi.service.remoteserviceadm import org.osgi.service.remoteserviceadmin.EndpointListener; import org.osgi.service.remoteserviceadmin.ExportReference; import org.osgi.service.remoteserviceadmin.ExportRegistration; -import org.osgi.service.remoteserviceadmin.ImportRegistration; import org.osgi.service.remoteserviceadmin.RemoteConstants; import org.osgi.service.remoteserviceadmin.RemoteServiceAdmin; import org.osgi.util.tracker.ServiceTracker; @@ -198,9 +196,12 @@ public class TopologyManager { Map> rsas = exportedServices.get(sref); for (Map.Entry> entry : rsas.entrySet()) { if (entry.getValue() != null) { - for (ExportRegistration exReg : entry.getValue()) { - if (exReg != null) - exReg.close(); + Collection registrations = entry.getValue(); + notifyListenersOfRemovalIfAppropriate(registrations); + for (ExportRegistration exReg : registrations) { + if (exReg != null) { + exReg.close(); + } } } } @@ -210,6 +211,12 @@ public class TopologyManager { } } + private void notifyListenersOfRemovalIfAppropriate(Collection registrations) { + for (ServiceReference endpointReference : stEndpointListeners.getServiceReferences()) { + notifyListenersOfRemovalIfAppropriate(endpointReference, registrations); + } + } + protected void exportService(ServiceReference sref) { // add to local list of services that should/are be exported