You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/02/03 11:52:41 UTC
[1/2] ignite git commit: IGNITE-843 Minor fix.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 0deca4c23 -> a9dbe6858
IGNITE-843 Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fabdaf42
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fabdaf42
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fabdaf42
Branch: refs/heads/ignite-843-rc2
Commit: fabdaf42a534ab270e20fc3918aa0e771c22a5f5
Parents: 0d14a01
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 3 17:52:22 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 3 17:52:22 2016 +0700
----------------------------------------------------------------------
.../src/main/js/helpers/generator/generator-java.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fabdaf42/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 4f4a1be..445a5a0 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
@@ -853,7 +853,7 @@ $generatorJava.clusterEvents = function (cluster, res) {
res.line('int k = 0;');
- _.forEach(cluster.includeEventTypes, function(value) {
+ _.forEach(cluster.includeEventTypes, function(value, idx) {
res.needEmptyLine = true;
var evtGrpDscr = _.find(evtGrps, {value: value});
@@ -861,7 +861,9 @@ $generatorJava.clusterEvents = function (cluster, res) {
evt = res.importStatic(evtGrpDscr.class + '.' + value);
res.line('System.arraycopy(' + evt + ', 0, events, k, ' + evt + '.length);');
- res.line('k += ' + evt + '.length;');
+
+ if (idx < cluster.includeEventTypes.length - 1)
+ res.line('k += ' + evt + '.length;');
});
res.needEmptyLine = true;
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a9dbe685
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a9dbe685
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a9dbe685
Branch: refs/heads/ignite-843-rc2
Commit: a9dbe68582e48411c5a03e270a9d4680f0bd5628
Parents: fabdaf4 0deca4c
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 3 17:52:40 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 3 17:52:40 2016 +0700
----------------------------------------------------------------------
.../main/js/views/configuration/domains-import.jade | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------