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

[scm-notify at zb4osgi.aaloa.org]

Author: manlio.bacco
Date: Thu Dec 20 15:05:15 2012
New Revision: 595

Log: (empty)

Modified:
    projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/configuration/ConfigurationService.java

Modified: projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/configuration/ConfigurationService.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/configuration/ConfigurationService.java (original)
+++ projects/zb4osgi/trunk/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/configuration/ConfigurationService.java Thu Dec 20 15:05:15 2012
@@ -76,6 +76,8 @@
 			configuration.put(ConfigurationProperties.AUTOMATIC_ENDPOINT_ADDRESS_RETRY_KEY, OSGiProperties.getInt(Activator.getBundleContext(), ConfigurationProperties.AUTOMATIC_ENDPOINT_ADDRESS_RETRY_KEY, ConfigurationProperties.AUTOMATIC_ENDPOINT_ADDRESS_RETRY) );
 			configuration.put(ConfigurationProperties.FIRST_ENDPOINT_ADDRESS_KEY, OSGiProperties.getInt(Activator.getBundleContext(), ConfigurationProperties.FIRST_ENDPOINT_ADDRESS_KEY, ConfigurationProperties.FIRST_ENDPOINT_ADDRESS) );
 
+			configuration.put(ConfigurationProperties.DEVICE_MSG_TIMEOUT_KEY, OSGiProperties.getInt(Activator.getBundleContext(), ConfigurationProperties.DEVICE_MSG_TIMEOUT_KEY, ConfigurationProperties.DEVICE_MSG_TIMEOUT) );
+
 			// EVENTUALLY CUSTOM DEVICES THAT WILL BE CREATED ON DONGLE
 			configuration.put(CustomDevices.ENDPOINT_KEY, OSGiProperties.getString(Activator.getBundleContext(), CustomDevices.ENDPOINT_KEY, CustomDevices.ENDPOINT));
 			configuration.put(CustomDevices.PROFILE_ID_KEY, OSGiProperties.getString(Activator.getBundleContext(), CustomDevices.PROFILE_ID_KEY, CustomDevices.PROFILE_ID));
@@ -101,7 +103,7 @@
 		DictionaryHelper helper = new DictionaryHelper(newConfig);
 		//boolean isChanged = false;
 		synchronized (this) {
-			/*isChanged = */setInteger( ConfigurationProperties.PAN_ID_KEY, helper.getInt(ConfigurationProperties.PAN_ID_KEY, getPanId() ) );			
+			/*isChanged = */ setInteger( ConfigurationProperties.PAN_ID_KEY, helper.getInt(ConfigurationProperties.PAN_ID_KEY, getPanId() ) );			
 			/*isChanged = */ setInteger( ConfigurationProperties.CHANNEL_ID_KEY, helper.getInt(ConfigurationProperties.CHANNEL_ID_KEY, getChannelId() ) );
 			/*isChanged = */ setInteger( ConfigurationProperties.COM_BOUDRATE_KEY, helper.getInt(ConfigurationProperties.COM_BOUDRATE_KEY, getSerialBoudRate() ) );
 			/*isChanged = */ setStringCaseSensitve( ConfigurationProperties.COM_NAME_KEY, helper.getString(ConfigurationProperties.COM_NAME_KEY, getSerialPortName() ) );
@@ -117,7 +119,7 @@
 
 			/*isChanged = */  setInteger( ConfigurationProperties.AUTOMATIC_ENDPOINT_ADDRESS_RETRY_KEY, helper.getInt( ConfigurationProperties.AUTOMATIC_ENDPOINT_ADDRESS_RETRY_KEY, getAutomaticFreeEndPointRetry() ) );
 			/*isChanged = */  setInteger( ConfigurationProperties.FIRST_ENDPOINT_ADDRESS_KEY, helper.getInt( ConfigurationProperties.FIRST_ENDPOINT_ADDRESS_KEY, getFirstFreeEndPoint() ) );
-
+			/*isChanged = */  setInteger( ConfigurationProperties.DEVICE_MSG_TIMEOUT_KEY, helper.getInt( ConfigurationProperties.DEVICE_MSG_TIMEOUT_KEY, getMsgTimeout() ) );
 
 			setStringCaseInsensitve(CustomDevices.ENDPOINT_KEY, helper.getString(CustomDevices.ENDPOINT_KEY, getString(CustomDevices.ENDPOINT_KEY)));
 			setStringCaseInsensitve(CustomDevices.PROFILE_ID_KEY, helper.getString(CustomDevices.PROFILE_ID_KEY, getString(CustomDevices.PROFILE_ID_KEY)));
@@ -129,7 +131,7 @@
 
 		logger.debug("Current configuration after applying new configuration is {}", configuration);
 
-		logger.info("Configuration related to the dongle changed, updating it.ss");
+		logger.info("Configuration related to the dongle changed, updating it");
 		updateDriverConfiguration();
 	}
 
@@ -280,4 +282,8 @@
 	public synchronized int getFirstFreeEndPoint() {
 		return getInt(ConfigurationProperties.FIRST_ENDPOINT_ADDRESS_KEY);
 	}
+
+	public synchronized int getMsgTimeout() {
+		return getInt(ConfigurationProperties.DEVICE_MSG_TIMEOUT_KEY);
+	}
 }