Merge pull request 4thline#82 from jomarmar/master

Fixed issue 4thline#15
hplan · Mar 14, 2014 · 206fd06 · 206fd06
2 parents 1b60a22 + dfdf6c0
commit 206fd06
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...er/src/main/java/org/fourthline/cling/osgi/basedriver/discover/ClingRegistryListener.java b/...er/src/main/java/org/fourthline/cling/osgi/basedriver/discover/ClingRegistryListener.java
@@ -64,15 +64,15 @@ class ClingRegistryListener extends DefaultRegistryListener {
     private UpnpService upnpService;
 
     class UPnPDeviceBinding {
-        private ServiceReference reference;
+        private ServiceRegistration reference;
         private ServiceTracker tracker;
 
-        UPnPDeviceBinding(ServiceReference reference, ServiceTracker tracker) {
+        UPnPDeviceBinding(ServiceRegistration reference, ServiceTracker tracker) {
             this.reference = reference;
             this.tracker = tracker;
         }
 
-        public ServiceReference getServiceReference() {
+        public ServiceRegistration getServiceRegistration() {
             return reference;
         }
 
@@ -106,7 +106,7 @@ public void deviceAdded(Registry registry, @SuppressWarnings("rawtypes") Device
                 tracker.open();
 
                 ServiceRegistration registration = context.registerService(UPnPDevice.class.getName(), upnpDevice, upnpDevice.getDescriptions(null));
-                deviceBindings.put(device, new UPnPDeviceBinding(registration.getReference(), tracker));
+                deviceBindings.put(device, new UPnPDeviceBinding(registration, tracker));
             } catch (InvalidSyntaxException e) {
                 log.severe(String.format("Cannot add remote device (%s).", device.getIdentity().getUdn().toString()));
                 log.severe(e.getMessage());
@@ -123,7 +123,7 @@ public void deviceRemoved(Registry registry, @SuppressWarnings("rawtypes") Devic
             if (data == null) {
                 log.warning(String.format("Unknown device %s removed.", device.getIdentity().getUdn().toString()));
             } else {
-                context.ungetService(data.getServiceReference());
+                data.getServiceRegistration().unregister();
                 data.getServiceTracker().close();
                 deviceBindings.remove(device);
             }