[dss-commits] r8833 - dss/trunk/unix

[dss-commits at forum.digitalstrom.org]

Author: jwinkelmann
Date: 2009-10-07 14:01:53 +0200 (Wed, 07 Oct 2009)
New Revision: 8833

Modified:
   dss/trunk/unix/ds485proxy.cpp
Log:
trunk: merge 8830 from branches/0.5


Modified: dss/trunk/unix/ds485proxy.cpp
===================================================================
--- dss/trunk/unix/ds485proxy.cpp	2009-10-07 12:01:13 UTC (rev 8832)
+++ dss/trunk/unix/ds485proxy.cpp	2009-10-07 12:01:53 UTC (rev 8833)
@@ -733,11 +733,15 @@
       cmdFrame.getPayload().add<uint16_t>(iDevice);
       int16_t res = int16_t(receiveSingleResult16(cmdFrame, FunctionGroupGetDevKeyForInd));
       if(res < 0) {
-        log("GetDevicesInGroup: Negative device id received '" + intToString(res) + "' for index " + intToString(iDevice));
+        log("GetDevicesInGroup: Negative device id received '" + intToString(res) + "' for index " + intToString(iDevice), lsFatal);
       } else {
         result.push_back(res);
       }
-      checkResultCode(res);
+      try {
+        checkResultCode(res);
+      } catch(DS485ApiError& err) {
+        log(std::string("Error reported back by dSM: ") + err.what(), lsFatal);
+      }
     }
 
     return result;