diff --git a/process/DataCaching_lib/process.js b/process/DataCaching_lib/process.js index b154d8f222b03fe30815c11695c22885c1ae9896..5eee5316c78bcd96d5fcb1f63316cac3d1e2ef34 100644 --- a/process/DataCaching_lib/process.js +++ b/process/DataCaching_lib/process.js @@ -1,3 +1,4 @@ +import("system.logging"); import("system.vars"); import("system.project"); @@ -67,11 +68,8 @@ CachedData.prototype.load = function(pDataCallbackFunction) cachingEnabled = false; else { - try - { - if (JSON.parse(project.getInstanceConfigValue("custom.dataCaching.client.forceDisable")) == true) - cachingEnabled = false; - } catch (ex) {/* ignore */} + if (JSON.parse(project.getInstanceConfigValue("custom.dataCaching.client.forceDisable", "false")) == true) + cachingEnabled = false; } if (!cachingEnabled) diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js index 24c3432f752201906042cda4cfe644175d1cebc7..ab6ee507a56d08f09d68ee9d85891dfc9a57a4a7 100644 --- a/process/WsValidation_lib/process.js +++ b/process/WsValidation_lib/process.js @@ -199,6 +199,11 @@ WsValidationUtils.validate = function(pValue, pType, pCountry) var url = project.getPreferenceValue("custom." + pType.webserviceName + ".url"); var countryParamName = project.getPreferenceValue("custom." + pType.webserviceName + ".countryParamName"); + if (!userName || !pw || !url || !countryParamName) + { + throw new Error("if the webservice " + pType.key + " is enabled, you have to provide also userName, pw, url and countryParamName") + } + var actionType = "GET"; if (pValue && pType) @@ -277,12 +282,7 @@ WsValidationUtils.isWsEnabled = function(pType) pType = WsValidationType.get(pType); // get configurations for this type - try - { - return JSON.parse(project.getPreferenceValue("custom." + pType.webserviceName + ".enable")); - } catch (exception) { - return false; - } + return JSON.parse(project.getPreferenceValue("custom." + pType.webserviceName + ".enable", "false")); } /**