cleanups

[libplp.git] / src / DataReader.cc

diff --git a/src/DataReader.cc b/src/DataReader.cc
index 72a44bd65a20ce6cbc0bbfd2592689e288ef2388..00f861a61dc116907712e6e8bb10ac7c52ca4492 100644 (file)
--- a/src/DataReader.cc
+++ b/src/DataReader.cc
@@ -34,6 +34,7 @@ bool string_to_number(NumberDataType& result,
 DataReader::DataReader(string device_id_param) {
        string  base_dir;
 
+       log_debug("device_id: %s\n", device_id_param.c_str());
        device_config   = NULL;
        device_id       = device_id_param;
        base_dir        = DeviceConfig::get_base_dir_name();
@@ -441,14 +442,19 @@ string DataReader::get_device_id() {
 }
 
 /**
- * Read device type from the device specific config file
+ * Read device type from the device specific config file.
+ *
+ * @rerurn string representing device type.
+ * In the case of error, an empty string is returned.
  */
 string DataReader::get_device_type() {
        string  ret_val;
 
        if (device_config == NULL) {
                device_config   = DeviceConfig::get_device_config(device_id);
-               ret_val         = device_config->get_cfg_value(DEVICE_CONFIG_VALUE_KEY__TYPE);
+       }
+       if (device_config != NULL) {
+               ret_val = device_config->get_config_value(DEVICE_CONFIG_VALUE_KEY__TYPE);
        }
        return ret_val;
 }