[SystemInfo] Fix for "BATTERY" property value change listener callbacks

Callbacks called on "BATTERY" property value change threw an exception,
if "lowThreshold" or "highThreshold" SystemInfoOptions were specified.

[Verification] Tested in Chrome DevTools, registered callbacks work
fine.

Change-Id: Ie50dfb0710e9b203e072ff5336b77ff27c464031
Signed-off-by: Pawel Wasowski <p.wasowski2@partner.samsung.com>

diff --git a/src/systeminfo/systeminfo_api.js b/src/systeminfo/systeminfo_api.js
index 2e5dc4fe7e3390f2d449d4b1439b34f620de3be7..bb656c04d699aa15d2ea63c064ac39badff8afc3 100644 (file)
--- a/src/systeminfo/systeminfo_api.js
+++ b/src/systeminfo/systeminfo_api.js
@@ -898,13 +898,13 @@ function _systeminfoBatteryListenerCallback(eventObj) {
     for (var watchId in callbacks) {
         if (callbacks.hasOwnProperty(watchId)) {
             var listener = callbacks[watchId];
+            var propObj = !listener.isArrayType ?
+                    _createProperty(property, eventObj.result.array[0]) :
+                        _createPropertyArray(property, eventObj.result);
             var executeCall = (T_.isUndefined(listener.lowThreshold) ||
                     (propObj.level <= listener.lowThreshold)) ||
                     (T_.isUndefined(listener.highThreshold) ||
                             (propObj.level >= listener.highThreshold));
-            var propObj = !listener.isArrayType ?
-                    _createProperty(property, eventObj.result.array[0]) :
-                        _createPropertyArray(property, eventObj.result);
             if (executeCall) {
                 listener.callback(propObj);
             }