ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject ignite git commit: IGNITE-1786: Minor corrections in IgniteConfiguration and OdbcConfiguration.
Date Mon, 25 Jan 2016 14:05:22 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1786 f7243aa99 -> 2116f631d


IGNITE-1786: Minor corrections in IgniteConfiguration and OdbcConfiguration.


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

Branch: refs/heads/ignite-1786
Commit: 2116f631dbfda96ce314c86105c0d9eaddf231b0
Parents: f7243aa
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Mon Jan 25 17:04:36 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Mon Jan 25 17:04:36 2016 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/configuration/IgniteConfiguration.java   | 4 ++--
 .../org/apache/ignite/configuration/OdbcConfiguration.java     | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2116f631/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index a9880e3..656e36c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -411,7 +411,7 @@ public class IgniteConfiguration {
     /** Client access configuration. */
     private ConnectorConfiguration connectorCfg = new ConnectorConfiguration();
 
-    /** Client access configuration. */
+    /** ODBC configuration. */
     private OdbcConfiguration odbcCfg = new OdbcConfiguration();
 
     /** Warmup closure. Will be invoked before actual grid start. */
@@ -481,7 +481,6 @@ public class IgniteConfiguration {
         cacheKeyCfg = cfg.getCacheKeyConfiguration();
         cacheSanityCheckEnabled = cfg.isCacheSanityCheckEnabled();
         connectorCfg = cfg.getConnectorConfiguration();
-        odbcCfg = cfg.getOdbcConfiguration();
         classLdr = cfg.getClassLoader();
         clientMode = cfg.isClientMode();
         clockSyncFreq = cfg.getClockSyncFrequency();
@@ -514,6 +513,7 @@ public class IgniteConfiguration {
         mgmtPoolSize = cfg.getManagementThreadPoolSize();
         netTimeout = cfg.getNetworkTimeout();
         nodeId = cfg.getNodeId();
+        odbcCfg = cfg.getOdbcConfiguration();
         p2pEnabled = cfg.isPeerClassLoadingEnabled();
         p2pLocClsPathExcl = cfg.getPeerClassLoadingLocalClassPathExclude();
         p2pMissedCacheSize = cfg.getPeerClassLoadingMissedResourcesCacheSize();

http://git-wip-us.apache.org/repos/asf/ignite/blob/2116f631/modules/core/src/main/java/org/apache/ignite/configuration/OdbcConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/OdbcConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/OdbcConfiguration.java
index 0cc6b8b..fbc064b 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/OdbcConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/OdbcConfiguration.java
@@ -17,10 +17,6 @@
 
 package org.apache.ignite.configuration;
 
-import org.apache.ignite.ssl.SslContextFactory;
-
-import javax.cache.configuration.Factory;
-import javax.net.ssl.SSLContext;
 import java.net.Socket;
 
 /**
@@ -82,8 +78,8 @@ public class OdbcConfiguration {
     public OdbcConfiguration(OdbcConfiguration cfg) {
         assert cfg != null;
 
-        idleTimeout = cfg.getIdleTimeout();
         directBuf = cfg.isDirectBuffer();
+        idleTimeout = cfg.getIdleTimeout();
         noDelay = cfg.isNoDelay();
         port = cfg.getPort();
         rcvBufSize = cfg.getReceiveBufferSize();


Mime
View raw message