Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 c453b2d40 -> 23ff13acd
IGNITE-843 Fixed security java code generation in case of non java symbols in user name. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/23ff13ac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/23ff13ac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/23ff13ac Branch: refs/heads/ignite-843-rc2 Commit: 23ff13acd25cabf351af2359558029e6944be1e0 Parents: c453b2d Author: Alexey Kuznetsov <[email protected]> Authored: Mon Dec 14 16:18:05 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Dec 14 16:18:05 2015 +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/23ff13ac/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 645d93c..73a90aa 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 @@ -85,11 +85,13 @@ $generatorJava.declareVariable = function (res, varName, varFullType, varFullAct if (varFullActualType && varFullGenericType1) { var varActualType = res.importClass(varFullActualType); var varGenericType1 = res.importClass(varFullGenericType1); + var varGenericType2 = null; if (varFullGenericType2) - var varGenericType2 = res.importClass(varFullGenericType2); + varGenericType2 = res.importClass(varFullGenericType2); - res.line((varNew ? (varType + '<' + varGenericType1 + (varGenericType2 ? ', ' + varGenericType2 : '') + '> ') : '') + varName + ' = new ' + varActualType + '<>();'); + res.line((varNew ? (varType + '<' + varGenericType1 + (varGenericType2 ? ', ' + varGenericType2 : '') + '> ') : '') + + varName + ' = new ' + varActualType + '<>();'); } else res.line((varNew ? (varType + ' ') : '') + varName + ' = new ' + varType + '();');
