cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
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 GMT
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<String, ExportRegistrationImpl> exportRegs = new LinkedHashMap<String,
ExportRegistrationImpl>(1);
+            List<ExportRegistration> exportRegs = new ArrayList<ExportRegistration>(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<ExportRegistration>(exportRegs.values()));
-
-            List<ExportRegistration> lExpReg = new ArrayList<ExportRegistration>(exportRegs.values());
-            eventProducer.publishNotifcation(lExpReg);
-
-            return lExpReg;
+            exportedServices.put(serviceProperties, new ArrayList<ExportRegistration>(exportRegs));
+            eventProducer.publishNotifcation(exportRegs);
+            return exportRegs;
         }
     }
 



Mime
View raw message