Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 91aab57bb -> e8216ed3a
IGNITE-1767 Fixed JDBC driver class selection. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8216ed3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8216ed3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8216ed3 Branch: refs/heads/ignite-843-rc1 Commit: e8216ed3a938c82bc5a289b0b74aac840258042c Parents: 91aab57 Author: vsisko <vsi...@gridgain.com> Authored: Wed Oct 28 11:45:01 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Oct 28 11:45:01 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/metadata-controller.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e8216ed3/modules/control-center-web/src/main/js/controllers/metadata-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js index 9a70c1d..8768bfe 100644 --- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js +++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js @@ -142,12 +142,14 @@ consoleModule.controller('metadataController', [ var jdbcDrivers = []; function _findPreset(jdbcDriverJar) { + var jdbcDriverClass = ''; + var idx = _.findIndex(jdbcDrivers, function (jdbcDriver) { return jdbcDriver.jdbcDriverJar == jdbcDriverJar; }); if (idx >= 0) { - var jdbcDriverClass = jdbcDrivers[idx].jdbcDriverClass; + jdbcDriverClass = jdbcDrivers[idx].jdbcDriverClass; idx = _.findIndex(presets, function (preset) { return preset.jdbcDriverClass == jdbcDriverClass; @@ -159,7 +161,7 @@ consoleModule.controller('metadataController', [ return { db: 'unknown', - jdbcDriverClass: '', + jdbcDriverClass: jdbcDriverClass, jdbcDriverJar: '', jdbcUrl: 'jdbc:[database]', user: 'sa'