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-2392 Fixed XML/java generation for case when IGFS selected, but no caches configured.
Date Fri, 15 Jan 2016 09:23:46 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 1b27c8c17 -> 6945cfcf8


IGNITE-2392 Fixed XML/java generation for case when IGFS selected, but no caches configured.


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

Branch: refs/heads/ignite-843-rc2
Commit: 6945cfcf8d0900b108cd6f531c782602dff5b070
Parents: 1b27c8c
Author: vsisko <vsisko@gridgain.com>
Authored: Fri Jan 15 16:23:52 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Jan 15 16:23:52 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/helpers/generator/generator-java.js              | 4 ++--
 .../src/main/js/helpers/generator/generator-xml.js               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6945cfcf/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index 64175d2..45ab442 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -1716,7 +1716,7 @@ $generatorJava.clusterCaches = function (caches, igfss, isSrvCfg, res)
{
 
     var names = [];
 
-    if (caches && caches.length > 0) {
+    if ($commonUtils.isDefinedAndNotEmpty(caches)) {
         res.emptyLineIfNeeded();
 
         _.forEach(caches, function (cache) {
@@ -1726,7 +1726,7 @@ $generatorJava.clusterCaches = function (caches, igfss, isSrvCfg, res)
{
         res.needEmptyLine = true;
     }
 
-    if (isSrvCfg && igfss && igfss.length > 0) {
+    if (isSrvCfg && $commonUtils.isDefinedAndNotEmpty(igfss)) {
         res.emptyLineIfNeeded();
 
         _.forEach(igfss, function (igfs) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/6945cfcf/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
index 96f4c0a..9e26c02 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
@@ -1244,7 +1244,7 @@ $generatorXml.clusterCaches = function(caches, igfss, isSrvCfg, res)
{
     if (!res)
         res = $generatorCommon.builder();
 
-    if ((caches && caches.length > 0) || (igfss && igfss.length > 0))
{
+    if ($commonUtils.isDefinedAndNotEmpty(caches) || (isSrvCfg && $commonUtils.isDefinedAndNotEmpty(igfss)))
{
         res.emptyLineIfNeeded();
 
         res.startBlock('<property name="cacheConfiguration">');


Mime
View raw message