Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / services / propertyService.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/propertyService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/propertyService.js
index ad9bf7d..b576b29 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/propertyService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/propertyService.js
@@ -29,7 +29,6 @@ var PropertyService = function($location, $http, VIDCONFIGURATION ) {
     var DEFAULT_MSO_MAX_POLLING_INTERVAL_MSEC = 60000;\r
     var DEFAULT_MSO_MAX_POLLS = 10;\r
     var DEFAULT_MSO_BASE_URL = "/" + BASE_PATH + "/mso";\r
-    var DEFAULT_SERVER_RESPONSE_TIMEOUT_MSEC = 60000;\r
     var MSO_POLLING_INTERVAL_MSECS = "mso_polling_interval_msecs";\r
     var MSO_MAX_POLLS = "mso_max_polls";\r
 \r
@@ -40,7 +39,6 @@ var PropertyService = function($location, $http, VIDCONFIGURATION ) {
     _this.msoMaxPollingIntervalMsec = DEFAULT_MSO_MAX_POLLING_INTERVAL_MSEC;\r
     _this.msoMaxPolls = DEFAULT_MSO_MAX_POLLS;\r
     _this.msoBaseUrl = DEFAULT_MSO_BASE_URL;\r
-    _this.serverResponseTimeoutMsec = DEFAULT_SERVER_RESPONSE_TIMEOUT_MSEC;\r
 \r
     return {\r
        \r
@@ -78,12 +76,9 @@ var PropertyService = function($location, $http, VIDCONFIGURATION ) {
            _this.msoBaseUrl = msoBaseUrl;\r
        },\r
        getServerResponseTimeoutMsec : function() {\r
-           return _this.serverResponseTimeoutMsec;\r
-       },\r
-       setServerResponseTimeoutMsec : function(serverResponseTimeoutMsec) {\r
-           _this.serverResponseTimeoutMsec = serverResponseTimeoutMsec;\r
+           return VIDCONFIGURATION.SERVER_RESPONSE_TIMEOUT_MSECS;\r
        }\r
     };\r
-}\r
+};\r
 \r
 appDS2.factory("PropertyService", PropertyService);\r