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 2015/06/29 05:32:12 UTC
incubator-ignite git commit: # ignite-843 Fixed near configuration.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 e8c4b6e11 -> 72b0a94b6
# ignite-843 Fixed near configuration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/72b0a94b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/72b0a94b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/72b0a94b
Branch: refs/heads/ignite-843
Commit: 72b0a94b699164aa844e5f2b0e8f1ad47396a0b8
Parents: e8c4b6e
Author: Andrey <an...@gridgain.com>
Authored: Mon Jun 29 10:32:42 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Jun 29 10:32:42 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/db.js | 3 +--
modules/webconfig/nodejs/utils/generatorJava.js | 18 ++++++++++--------
modules/webconfig/nodejs/utils/generatorXml.js | 3 +--
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72b0a94b/modules/webconfig/nodejs/db.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/db.js b/modules/webconfig/nodejs/db.js
index 701b534..5be5c89 100644
--- a/modules/webconfig/nodejs/db.js
+++ b/modules/webconfig/nodejs/db.js
@@ -158,8 +158,7 @@ var CacheSchema = new Schema({
maxMemorySize: Number,
maxSize: Number
}
- },
- atomicSequenceReserveSize: Number
+ }
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72b0a94b/modules/webconfig/nodejs/utils/generatorJava.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorJava.js b/modules/webconfig/nodejs/utils/generatorJava.js
index 0bbdd73..50c6cb0 100644
--- a/modules/webconfig/nodejs/utils/generatorJava.js
+++ b/modules/webconfig/nodejs/utils/generatorJava.js
@@ -328,14 +328,16 @@ function generateCacheConfiguration(cacheCfg, varName, res) {
createEvictionPolicy(res, cacheCfg.evictionPolicy, varName, 'evictionPolicy');
- res.needEmptyLine = true;
-
- addBeanWithProperties(res, cacheCfg.nearConfiguration, varName, 'nearConfiguration', 'nearConfiguration',
- 'org.apache.ignite.configuration.NearCacheConfiguration',
- {nearStartSize: null, atomicSequenceReserveSize: null}, true);
-
- if (cacheCfg.nearConfiguration && cacheCfg.nearConfiguration.nearEvictionPolicy && cacheCfg.nearConfiguration.nearEvictionPolicy.kind) {
- createEvictionPolicy(res, cacheCfg.nearConfiguration.nearEvictionPolicy, 'nearConfiguration', 'nearEvictionPolicy');
+ if (cacheCfg.nearConfiguration && (cacheCfg.nearConfiguration.nearStartSize || cacheCfg.nearConfiguration.nearEvictionPolicy.kind)) {
+ res.needEmptyLine = true;
+
+ addBeanWithProperties(res, cacheCfg.nearConfiguration, varName, 'nearConfiguration', 'nearConfiguration',
+ 'org.apache.ignite.configuration.NearCacheConfiguration',
+ {nearStartSize: null, atomicSequenceReserveSize: null}, true);
+
+ if (cacheCfg.nearConfiguration && cacheCfg.nearConfiguration.nearEvictionPolicy && cacheCfg.nearConfiguration.nearEvictionPolicy.kind) {
+ createEvictionPolicy(res, cacheCfg.nearConfiguration.nearEvictionPolicy, 'nearConfiguration', 'nearEvictionPolicy');
+ }
}
res.needEmptyLine = true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72b0a94b/modules/webconfig/nodejs/utils/generatorXml.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorXml.js b/modules/webconfig/nodejs/utils/generatorXml.js
index c716c8c..99b2961 100644
--- a/modules/webconfig/nodejs/utils/generatorXml.js
+++ b/modules/webconfig/nodejs/utils/generatorXml.js
@@ -310,14 +310,13 @@ function generateCacheConfiguration(cacheCfg, res) {
res.needEmptyLine = true;
- if (cacheCfg.nearConfiguration) {
+ if (cacheCfg.nearConfiguration && (cacheCfg.nearConfiguration.nearStartSize || cacheCfg.nearConfiguration.nearEvictionPolicy.kind)) {
res.emptyLineIfNeeded();
res.startBlock('<property name="nearConfiguration">');
res.startBlock('<bean class="org.apache.ignite.configuration.NearCacheConfiguration">');
addProperty(res, cacheCfg.nearConfiguration, 'nearStartSize');
- addProperty(res, cacheCfg.nearConfiguration, 'atomicSequenceReserveSize');
createEvictionPolicy(res, cacheCfg.nearConfiguration.nearEvictionPolicy, 'nearEvictionPolicy');