Merge pull request #1346 from kgoderis/udptest

TCP/UDP Binding : fix .cfg issues, improve exception handling
openhab · Aug 17, 2014 · db513aa · db513aa
2 parents 6322996 + 1ac5526
commit db513aa
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/...enhab.binding.tcp/src/main/java/org/openhab/binding/tcp/protocol/internal/TCPBinding.java b/...enhab.binding.tcp/src/main/java/org/openhab/binding/tcp/protocol/internal/TCPBinding.java
@@ -180,14 +180,24 @@ public void updated(Dictionary config) throws ConfigurationException {
 
 			String preambleString = (String) config.get("preamble");
 			if (StringUtils.isNotBlank(preambleString)) {
-				preAmble = preambleString.replaceAll("\\\\", "\\");
+				try {
+					preAmble = preambleString.replaceAll("\\\\", "\\");
+				}
+				catch(Exception e) {
+					preAmble = preambleString;
+				}
 			} else {
 				logger.info("The preamble for all write operations will be set to the default vaulue of {}",preAmble);
 			}
 
 			String postambleString = (String) config.get("postamble");
 			if (StringUtils.isNotBlank(postambleString)) {
-				postAmble = postambleString.replaceAll("\\\\", "\\");;
+				try {
+					postAmble = postambleString.replaceAll("\\\\", "\\");
+				}
+				catch(Exception e) {
+					postAmble = postambleString;
+				}
 			} else {
 				logger.info("The postamble for all write operations will be set to the default vaulue of {}",postAmble);
 			}
@@ -253,7 +263,7 @@ protected String transformResponse(String transformation, String response) {
 				logger.warn("couldn't transform response because transformationService of type '{}' is unavailable", transformationType);
 			}
 		}
-		catch (TransformationException te) {
+		catch (Exception te) {
 			logger.error("transformation throws exception [transformation="
 					+ transformation + ", response=" + response + "]", te);
 

diff --git a/...enhab.binding.tcp/src/main/java/org/openhab/binding/tcp/protocol/internal/UDPBinding.java b/...enhab.binding.tcp/src/main/java/org/openhab/binding/tcp/protocol/internal/UDPBinding.java
@@ -181,14 +181,24 @@ public void updated(Dictionary config) throws ConfigurationException {
 
 			String preambleString = (String) config.get("preamble");
 			if (StringUtils.isNotBlank(preambleString)) {
-				preAmble = preambleString.replaceAll("\\\\", "\\");
+				try {
+					preAmble = preambleString.replaceAll("\\\\", "\\");
+				}
+				catch(Exception e) {
+					preAmble = preambleString;
+				}
 			} else {
 				logger.info("The preamble for all write operations will be set to the default vaulue of {}",preAmble);
 			}
 
 			String postambleString = (String) config.get("postamble");
 			if (StringUtils.isNotBlank(postambleString)) {
-				postAmble = postambleString.replaceAll("\\\\", "\\");;
+				try {
+					postAmble = postambleString.replaceAll("\\\\", "\\");
+				}
+				catch(Exception e) {
+					postAmble = postambleString;
+				}
 			} else {
 				logger.info("The postamble for all write operations will be set to the default vaulue of {}",postAmble);
 			}
@@ -254,7 +264,7 @@ protected String transformResponse(String transformation, String response) {
 				logger.warn("couldn't transform response because transformationService of type '{}' is unavailable", transformationType);
 			}
 		}
-		catch (TransformationException te) {
+		catch (Exception te) {
 			logger.error("transformation throws exception [transformation="
 					+ transformation + ", response=" + response + "]", te);
 

diff --git a/distribution/openhabhome/configurations/openhab_default.cfg b/distribution/openhabhome/configurations/openhab_default.cfg
@@ -965,7 +965,7 @@ hue:secret=openHABRuntime
 #tcp:port=25001
 
 # Cron-like string to reconnect remote ends, e.g for unstable connection or remote ends
-#tcp:reconnectron='0 0 0 * * ?'
+#tcp:reconnectcron=0 0 0 * * ?
 
 # Interval between reconnection attempts when recovering from a communication error, 
 # in seconds
@@ -990,10 +990,10 @@ hue:secret=openHABRuntime
 #tcp:addressmask=true
 
 # Pre-amble that will be put in front of data being sent
-#tcp:preamble=''
+#tcp:preamble=
 
 # Post-amble that will be appended to data being sent
-#tcp:postamble='\r\n'
+#tcp:postamble=\r\n
 
 # Perform all write/read (send/receive) operations in a blocking mode, e.g. the binding
 # will wait for a reply from the remote end after data has been sent