You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/09/13 10:28:08 UTC
[1/2] ignite git commit: Cosmetics.
Repository: ignite
Updated Branches:
refs/heads/ignite-5896 500b4e59f -> d1a7af6c8
Cosmetics.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa62312f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa62312f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa62312f
Branch: refs/heads/ignite-5896
Commit: fa62312f689d03ba449cb222d4fbdf80aa5999e9
Parents: 4bbd330
Author: devozerov <vo...@gridgain.com>
Authored: Wed Sep 13 13:26:44 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Sep 13 13:26:44 2017 +0300
----------------------------------------------------------------------
.../processors/platform/client/ClientResponse.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa62312f/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
index 5bb37af..95f614d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
@@ -19,30 +19,29 @@ package org.apache.ignite.internal.processors.platform.client;
import org.apache.ignite.binary.BinaryRawWriter;
import org.apache.ignite.internal.processors.odbc.SqlListenerResponse;
-import org.jetbrains.annotations.Nullable;
/**
* Thin client response.
*/
public class ClientResponse extends SqlListenerResponse {
/** Request id. */
- private final int requestId;
+ private final int reqId;
/**
- * Ctor.
+ * Constructor.
*
- * @param requestId Request id.
+ * @param reqId Request id.
*/
- public ClientResponse(int requestId) {
+ public ClientResponse(int reqId) {
super(STATUS_SUCCESS, null);
- this.requestId = requestId;
+ this.reqId = reqId;
}
/**
* Encodes the response data.
*/
public void encode(BinaryRawWriter writer) {
- writer.writeInt(requestId);
+ writer.writeInt(reqId);
}
}
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-5896' into ignite-5896
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-5896' into ignite-5896
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d1a7af6c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1a7af6c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1a7af6c
Branch: refs/heads/ignite-5896
Commit: d1a7af6c8337c17e1d13b5af2b93130d93c1a6a3
Parents: fa62312 500b4e5
Author: devozerov <vo...@gridgain.com>
Authored: Wed Sep 13 13:27:29 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Sep 13 13:27:29 2017 +0300
----------------------------------------------------------------------
.../processors/platform/client/ClientBooleanResponse.java | 2 +-
.../processors/platform/client/ClientMessageParser.java | 2 +-
.../processors/platform/client/ClientObjectResponse.java | 2 +-
.../internal/processors/platform/client/ClientRequest.java | 6 +++---
.../processors/platform/client/ClientRequestHandler.java | 2 +-
.../internal/processors/platform/client/ClientResponse.java | 6 +++---
.../client/binary/ClientGetBinaryTypeNameResponse.java | 2 +-
.../client/binary/ClientGetBinaryTypeSchemaResponse.java | 2 +-
.../dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs | 4 ++--
.../dotnet/Apache.Ignite.Core/Impl/Client/ClientSocket.cs | 6 +++---
10 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d1a7af6c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
index 95f614d,3b2fcf6..6f2e8d6
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java
@@@ -25,23 -26,23 +25,23 @@@ import org.apache.ignite.internal.proce
*/
public class ClientResponse extends SqlListenerResponse {
/** Request id. */
- private final int reqId;
- private final long requestId;
++ private final long reqId;
/**
- * Ctor.
+ * Constructor.
*
- * @param requestId Request id.
+ * @param reqId Request id.
*/
- public ClientResponse(int reqId) {
- public ClientResponse(long requestId) {
++ public ClientResponse(long reqId) {
super(STATUS_SUCCESS, null);
- this.requestId = requestId;
+ this.reqId = reqId;
}
/**
* Encodes the response data.
*/
public void encode(BinaryRawWriter writer) {
- writer.writeInt(reqId);
- writer.writeLong(requestId);
++ writer.writeLong(reqId);
}
}