[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r1090 - /projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThread.java

[scm-notify at zb4osgi.aaloa.org]

Author: stefano.lenzi
Date: Fri Nov  7 20:17:06 2014
New Revision: 1090

Log:
Added some comment for code that seems to be bugged


Modified:
    projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThread.java

Modified: projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThread.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThread.java	(original)
+++ projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThread.java	Fri Nov  7 20:17:06 2014
@@ -200,33 +200,22 @@
         return true;
     }
 
-    private void doUpdateZigBeeDeviceService(ZigBeeNode node, byte ep) {
-        {
-
-            final ZigBeeNetwork network = AFLayer.getAFLayer(driver)
-                    .getZigBeeNetwork();
-
-            try {
-                ZigBeeDeviceImpl device = new ZigBeeDeviceImpl(driver, node, ep);
-                if (network.removeDevice(node, ep) && network.addDevice(device)) {
-                    synchronized (Activator.devices) {
-                        TByteObjectHashMap<ServiceRegistration> nodeServices = Activator.devices
-                                .get(node.getIEEEAddress());
-                        ServiceRegistration endpointService = nodeServices
-                                .get(ep);
-                        ((ZigBeeNodeImpl) endpointService)
-                                .setNetworkAddress(node.getNetworkAddress());
-
-                    }
-                }
-
-            } catch (ZigBeeBasedriverException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-
-        }
-    }
+	private void doUpdateZigBeeDeviceService(ZigBeeNode node, byte ep) {
+		final ZigBeeNetwork network = AFLayer.getAFLayer(driver).getZigBeeNetwork();
+		try {
+			ZigBeeDeviceImpl device = new ZigBeeDeviceImpl(driver, node, ep);
+			if (network.removeDevice(node, ep) && network.addDevice(device)) {
+				synchronized (Activator.devices) {
+					TByteObjectHashMap<ServiceRegistration> nodeServices = Activator.devices.get(node.getIEEEAddress());
+					ServiceRegistration endpointService = nodeServices.get(ep);
+					// FIX the line below should be throw a ClassCastException but it is not tested by any TestUnit
+					((ZigBeeNodeImpl) endpointService).setNetworkAddress(node.getNetworkAddress());
+				}
+			}
+		} catch (ZigBeeBasedriverException e) {
+			e.printStackTrace();
+		}
+	}
 
     private void doRemoveZigBeeDeviceService(ZigBeeNode node, byte ep) {