ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-2490 Added null checks.
Date Thu, 28 Jan 2016 16:26:16 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 5c3f43590 -> 02d97e3f7


IGNITE-2490 Added null checks.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/02d97e3f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/02d97e3f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/02d97e3f

Branch: refs/heads/ignite-843-rc2
Commit: 02d97e3f7792dd1bb05c13362809f23c1b01171f
Parents: 5c3f435
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Thu Jan 28 23:26:22 2016 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Thu Jan 28 23:26:22 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/clusters-controller.js           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/02d97e3f/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index c38f74e..e5aa9ee 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -496,13 +496,13 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
                 if (!$common.isEmptyString(d.authenticator) && !$common.isValidJavaClass('Node
authenticator', d.authenticator, false, 'authenticator', false, $scope.panels, 'discovery'))
                     return false;
 
-                if (d.kind === 'Vm' && d.Vm.addresses.length === 0)
+                if (d.kind === 'Vm' && d.Vm && d.Vm.addresses.length ===
0)
                     return showPopoverMessage($scope.panels, 'general', 'addresses', 'Addresses
are not specified');
 
-                if (d.kind === 'S3' && $common.isEmptyString(d.S3.bucketName))
+                if (d.kind === 'S3' && d.S3 && $common.isEmptyString(d.S3.bucketName))
                     return showPopoverMessage($scope.panels, 'general', 'bucketName', 'Bucket
name should not be empty');
 
-                if (d.kind === 'Cloud') {
+                if (d.kind === 'Cloud' && d.Cloud) {
                     if ($common.isEmptyString(d.Cloud.identity))
                         return showPopoverMessage($scope.panels, 'general', 'identity', 'Identity
should not be empty');
 
@@ -510,7 +510,7 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
                         return showPopoverMessage($scope.panels, 'general', 'provider', 'Provider
should not be empty');
                 }
 
-                if (d.kind === 'GoogleStorage') {
+                if (d.kind === 'GoogleStorage' && d.GoogleStorage) {
                     if ($common.isEmptyString(d.GoogleStorage.projectName))
                         return showPopoverMessage($scope.panels, 'general', 'projectName',
'Project name should not be empty');
 


Mime
View raw message