Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 6f795cef1 -> 6dfd3b51d
IGNITE-843 Fixed NPE. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6dfd3b51 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6dfd3b51 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6dfd3b51 Branch: refs/heads/ignite-843-rc1 Commit: 6dfd3b51da6b57f81f7c2c496ceeef798cf1418c Parents: 6f795ce Author: vsisko <[email protected]> Authored: Fri Nov 13 15:48:56 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Nov 13 15:48:56 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 22 +++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6dfd3b51/modules/control-center-web/src/main/js/controllers/caches-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js index 0713df5..e16cd75 100644 --- a/modules/control-center-web/src/main/js/controllers/caches-controller.js +++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js @@ -130,22 +130,24 @@ consoleModule.controller('cachesController', [ }; $scope.required = function (field) { - var model = $common.isDefined(field.path) ? field.path + '.' + field.model : field.model; - var backupItem = $scope.backupItem; - var memoryMode = backupItem.memoryMode; + if (backupItem) { + var model = $common.isDefined(field.path) ? field.path + '.' + field.model : field.model; + + var memoryMode = backupItem.memoryMode; - var onHeapTired = memoryMode == 'ONHEAP_TIERED'; - var offHeapTired = memoryMode == 'OFFHEAP_TIERED'; + var onHeapTired = memoryMode == 'ONHEAP_TIERED'; + var offHeapTired = memoryMode == 'OFFHEAP_TIERED'; - var offHeapMaxMemory = backupItem.offHeapMaxMemory; + var offHeapMaxMemory = backupItem.offHeapMaxMemory; - if (model == 'offHeapMaxMemory' && offHeapTired) - return true; + if (model == 'offHeapMaxMemory' && offHeapTired) + return true; - if (model == 'evictionPolicy.kind' && onHeapTired) - return backupItem.swapEnabled || ($common.isDefined(offHeapMaxMemory) && offHeapMaxMemory >= 0); + if (model == 'evictionPolicy.kind' && onHeapTired) + return backupItem.swapEnabled || ($common.isDefined(offHeapMaxMemory) && offHeapMaxMemory >= 0); + } return false; };
