ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ptupit...@apache.org
Subject [1/2] ignite git commit: Merge branch 'master' into ignite-5896
Date Wed, 06 Sep 2017 14:45:09 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5896 de7d421c1 -> 6aeed1f1e


Merge branch 'master' into ignite-5896

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerNioListener.java
#	modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj


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

Branch: refs/heads/ignite-5896
Commit: b70f05892938282b4cb77ee5c14c7458bbd36fe2
Parents: de7d421
Author: Pavel Tupitsyn <ptupitsyn@apache.org>
Authored: Wed Sep 6 17:31:37 2017 +0300
Committer: Pavel Tupitsyn <ptupitsyn@apache.org>
Committed: Wed Sep 6 17:31:37 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/odbc/SqlListenerNioListener.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b70f0589/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerNioListener.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerNioListener.java
index 09a9c53..fc0a0e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerNioListener.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.binary.streams.BinaryHeapOutputStream;
 import org.apache.ignite.internal.binary.streams.BinaryInputStream;
 import org.apache.ignite.internal.processors.odbc.jdbc.JdbcConnectionContext;
 import org.apache.ignite.internal.processors.odbc.odbc.OdbcConnectionContext;
+import org.apache.ignite.internal.processors.platform.client.ClientConnectionContext;
 import org.apache.ignite.internal.processors.platform.client.ClientMessageParser;
 import org.apache.ignite.internal.processors.platform.client.ClientRequestHandler;
 import org.apache.ignite.internal.util.GridSpinBusyLock;
@@ -238,7 +239,7 @@ public class SqlListenerNioListener extends GridNioServerListenerAdapter<byte[]>
                 return new JdbcConnectionContext(ctx, busyLock, maxCursors);
 
             case THIN_CLIENT:
-                return new ClientConnectionContext(ctx, busyLock, maxCursors);
+                return new ClientConnectionContext(ctx);
 
             default:
                 throw new IgniteException("Unknown client type: " + clientType);


Mime
View raw message