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 5BBF6F66D for ; Fri, 12 Apr 2013 13:20:20 +0000 (UTC) Received: (qmail 54538 invoked by uid 500); 12 Apr 2013 13:20:20 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 54457 invoked by uid 500); 12 Apr 2013 13:20:19 -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 54446 invoked by uid 99); 12 Apr 2013 13:20:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Apr 2013 13:20:19 +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; Fri, 12 Apr 2013 13:20:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3BEC423888FD; Fri, 12 Apr 2013 13:19:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1467260 - /cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java Date: Fri, 12 Apr 2013 13:19:58 -0000 To: commits@cxf.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130412131958.3BEC423888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cschneider Date: Fri Apr 12 13:19:57 2013 New Revision: 1467260 URL: http://svn.apache.org/r1467260 Log: DOSGI-165 Applying slighty changed patch with thanks to Amichai Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java?rev=1467260&r1=1467259&r2=1467260&view=diff ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java (original) +++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java Fri Apr 12 13:19:57 2013 @@ -99,7 +99,7 @@ public class RemoteServiceAdminCore impl return copyExportRegistration(serviceProperties); } LOG.info("interfaces selected for export: " + interfaces); - Map exportRegs = new LinkedHashMap(1); + List exportRegs = new ArrayList(1); Object serviceObject = bctx.getService(serviceReference); BundleContext callingContext = serviceReference.getBundle().getBundleContext(); ConfigurationTypeHandler handler = null; @@ -128,17 +128,14 @@ public class RemoteServiceAdminCore impl LOG.error(exportResult.getException().getMessage(), exportResult.getException()); exportRegistration.setException(exportResult.getException()); } - exportRegs.put(iface, exportRegistration); + exportRegs.add(exportRegistration); } } // enlist initial export Registrations in global list of exportRegistrations - exportedServices.put(serviceProperties, new ArrayList(exportRegs.values())); - - List lExpReg = new ArrayList(exportRegs.values()); - eventProducer.publishNotifcation(lExpReg); - - return lExpReg; + exportedServices.put(serviceProperties, new ArrayList(exportRegs)); + eventProducer.publishNotifcation(exportRegs); + return exportRegs; } }