[1/2] ignite git commit: IGNITE-1649 Check property is defined.

[akuznetsov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 962ad5a5c -> b226d1bf6


IGNITE-1649 Check property is defined.


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

Branch: refs/heads/ignite-843-rc1
Commit: 032466abbe6fec7d1d982d6464676f35d88e516b
Parents: 962ad5a
Author: vsisko <vsi...@gridgain.com>
Authored: Thu Oct 15 13:42:08 2015 +0700
Committer: Alexey Kuznetsov <akuznet...@apache.org>
Committed: Thu Oct 15 13:42:08 2015 +0700

----------------------------------------------------------------------
 .../main/js/routes/generator/generator-xml.js    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/032466ab/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
----------------------------------------------------------------------
diff --git 
a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js 
b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
index ac07aac..4f627a2 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
@@ -129,7 +129,7 @@ $generatorXml.arrayProperty = function (res, obj, propName, 
descr, rowFactory) {
         res.endBlock('</list>');
         res.endBlock('</property>');
     }
-}
+};
 
 // Add bean property.
 $generatorXml.beanProperty = function (res, bean, beanPropName, desc, 
createBeanAlthoughNoProps) {
@@ -397,7 +397,7 @@ $generatorXml.clusterCommunication = function (cluster, 
res) {
     if (!res)
         res = $generatorCommon.builder();
 
-    $generatorXml.beanProperty(res, cluster.communication, 'communicationSpi', 
$generatorCommon.COMMUNICATION_CONFIGURATION)
+    $generatorXml.beanProperty(res, cluster.communication, 'communicationSpi', 
$generatorCommon.COMMUNICATION_CONFIGURATION);
 
     $generatorXml.property(res, cluster, 'networkTimeout');
     $generatorXml.property(res, cluster, 'networkSendRetryDelay');
@@ -444,7 +444,8 @@ $generatorXml.clusterDiscovery = function (disco, res) {
     $generatorXml.property(res, disco, 'localAddress');
     $generatorXml.property(res, disco, 'localPort', undefined, 47500);
     $generatorXml.property(res, disco, 'localPortRange', undefined, 100);
-    $generatorXml.beanProperty(res, disco, 'addressResolver', {className: 
disco.addressResolver}, true);
+    if ($commonUtils.isDefinedAndNotEmpty(disco.addressResolver))
+        $generatorXml.beanProperty(res, disco, 'addressResolver', {className: 
disco.addressResolver}, true);
     $generatorXml.property(res, disco, 'socketTimeout');
     $generatorXml.property(res, disco, 'ackTimeout');
     $generatorXml.property(res, disco, 'maxAckTimeout', undefined, 600000);
@@ -455,13 +456,17 @@ $generatorXml.clusterDiscovery = function (disco, res) {
     $generatorXml.property(res, disco, 'maxMissedHeartbeats', undefined, 1);
     $generatorXml.property(res, disco, 'maxMissedClientHeartbeats', undefined, 
5);
     $generatorXml.property(res, disco, 'topHistorySize', undefined, 100);
-    $generatorXml.beanProperty(res, disco, 'listener', {className: 
disco.listener}, true);
-    $generatorXml.beanProperty(res, disco, 'dataExchange', {className: 
disco.dataExchange}, true);
-    $generatorXml.beanProperty(res, disco, 'metricsProvider', {className: 
disco.metricsProvider}, true);
+    if ($commonUtils.isDefinedAndNotEmpty(disco.listener))
+        $generatorXml.beanProperty(res, disco, 'listener', {className: 
disco.listener}, true);
+    if ($commonUtils.isDefinedAndNotEmpty(disco.dataExchange))
+        $generatorXml.beanProperty(res, disco, 'dataExchange', {className: 
disco.dataExchange}, true);
+    if ($commonUtils.isDefinedAndNotEmpty(disco.metricsProvider))
+        $generatorXml.beanProperty(res, disco, 'metricsProvider', {className: 
disco.metricsProvider}, true);
     $generatorXml.property(res, disco, 'reconnectCount', undefined, 10);
     $generatorXml.property(res, disco, 'statisticsPrintFrequency', undefined, 
0);
     $generatorXml.property(res, disco, 'ipFinderCleanFrequency', undefined, 
60000);
-    $generatorXml.beanProperty(res, disco, 'authenticator', {className: 
disco.authenticator}, true);
+    if ($commonUtils.isDefinedAndNotEmpty(disco.authenticator))
+        $generatorXml.beanProperty(res, disco, 'authenticator', {className: 
disco.authenticator}, true);
     $generatorXml.property(res, disco, 'forceServerMode', undefined, false);
     $generatorXml.property(res, disco, 'clientReconnectDisabled', undefined, 
false);