Changeset 2540

Timestamp:

Jul 3, 2014, 2:27:20 PM (9 years ago)

Author:

olle

Message:

Refs #615. Lab environment extension updated to handle odd lab sensor output and improve debug logging:

1. Class\file LabSensorUtil.java in src/net/sf/basedb/labenv/util/ updated:
   a. Public method LabEnvironmentData createLabEnvironmentData(String sensorUrl, String sensorName) updated to check lengths of byte arrays before using data.
   b. Private method String fetchDataFromUrl(String url) updated in debug output with more info concerning current method and more complete stack trace after an exception is thrown (by using ',' instead of '+' before exception output in log.debug() call).

File:

• extensions/net.sf.basedb.labenv/trunk/src/net/sf/basedb/labenv/util/LabSensorUtil.java (modified) (4 diffs)

extensions/net.sf.basedb.labenv/trunk/src/net/sf/basedb/labenv/util/LabSensorUtil.java

@@ -186 +186 @@
         }
         // Get raw variable values from Base64-decoded byte array
-        int ch1 = (d20ByteArray[26] & 0xFF) | ((d20ByteArray[27] & 0xFF) << 8);
-        int ch2 = (d20ByteArray[42] & 0xFF) | ((d20ByteArray[43] & 0xFF) << 8);
-        // Variable nowTime is the number of seconds since 1070-01-01 00:00:00
-        long nowTime = (d20ByteArray[6] & 0xFF) | ((d20ByteArray[7] & 0xFF) << 8) | ((d20ByteArray[8] & 0xFF) << 16) | ((d20ByteArray[9] & 0xFF) << 24);
-        // Get variable values from raw variable values
-        temperature = (ch1 - 1000)/10.0;
-        humidity = (ch2 - 1000)/10.0;
-        // Convert nowTime to number of ms since 1070-01-01 00:00:00 before getting dateTime
-        dateTime = new Date(nowTime*1000);
-        labEnvironmentData = new LabEnvironmentData(sensorUrl, sensorName, serialNumber, dateTime, temperature, humidity);
+        if (d20ByteArray.length >= 44)
+        {         
+          int ch1 = (d20ByteArray[26] & 0xFF) | ((d20ByteArray[27] & 0xFF) << 8);
+          int ch2 = (d20ByteArray[42] & 0xFF) | ((d20ByteArray[43] & 0xFF) << 8);
+          // Variable nowTime is the number of seconds since 1070-01-01 00:00:00
+          long nowTime = (d20ByteArray[6] & 0xFF) | ((d20ByteArray[7] & 0xFF) << 8) | ((d20ByteArray[8] & 0xFF) << 16) | ((d20ByteArray[9] & 0xFF) << 24);
+          // Get variable values from raw variable values
+          temperature = (ch1 - 1000)/10.0;
+          humidity = (ch2 - 1000)/10.0;
+          // Convert nowTime to number of ms since 1070-01-01 00:00:00 before getting dateTime
+          dateTime = new Date(nowTime*1000);
+          labEnvironmentData = new LabEnvironmentData(sensorUrl, sensorName, serialNumber, dateTime, temperature, humidity);
+        }
+        else
+        {
+          log.debug("createLabEnvironmentData(" + sensorUrl + ", " + sensorName + "): d20ByteArray.length = " + d20ByteArray.length + " < 44");
+        }
       }
       catch (ParseException e)
@@ -231 +238 @@
       if (statusCode != HttpStatus.SC_OK)
       {
-        log.debug("Error when trying to execute GetMethod: " + getMethod.getStatusLine());
+        log.debug("fetchDataFromUrl(" + url + "): Error when trying to execute GetMethod: " + getMethod.getStatusLine());
       }
       // Display response
@@ -239 +246 @@
     catch (IOException e)
     {
-      log.debug("IOException when trying to execute HttpClient method : " + e);
+      log.debug("fetchDataFromUrl(" + url + "): IOException when trying to execute HttpClient method : ", e);
       ioErrorString = e.getMessage();
     }
     catch (Exception e1)
     {
-      log.debug("Exception when trying to execute HttpClient method : " + e1);
+      log.debug("fetchDataFromUrl(" + url + "): Exception when trying to execute HttpClient method : ", e1);
       ioErrorString = e1.getMessage();
     }
@@ -256 +263 @@
       else
       {
-        log.debug("Connection to GetMethod already closed.");
-      }
-    }
+        log.debug("fetchDataFromUrl(" + url + "): Connection to GetMethod already closed.");
+      }
+    }
+    //log.debug("fetchDataFromUrl(" + url + "): content = " + content);
     return content;
   }