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 2016/09/07 11:17:31 UTC
[46/50] [abbrv] ignite git commit: Finalization.
Finalization.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/69f9c9ea
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/69f9c9ea
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/69f9c9ea
Branch: refs/heads/ignite-2649
Commit: 69f9c9eaefc71c95e159362f3907cdc0c704d566
Parents: d712d2a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 7 14:05:47 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 7 14:05:47 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheUtils.java | 1 +
.../org/apache/ignite/internal/util/nio/GridNioServer.java | 8 +-------
.../ignite/internal/util/nio/GridSelectorNioSessionImpl.java | 4 +---
3 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/69f9c9ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 138ed81..ba563e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -55,6 +55,7 @@ import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.store.CacheStoreSessionListener;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.FileSystemConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.TransactionConfiguration;
import org.apache.ignite.internal.GridKernalContext;
http://git-wip-us.apache.org/repos/asf/ignite/blob/69f9c9ea/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 7470759..ac55a14 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -47,7 +47,6 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.configuration.ConnectorConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.util.GridConcurrentHashSet;
@@ -197,9 +196,6 @@ public class GridNioServer<T> {
}
}
- /** Grid name */
- private String gridName;
-
/**
* @param addr Address.
* @param port Port.
@@ -264,7 +260,6 @@ public class GridNioServer<T> {
this.sockSndBuf = sockSndBuf;
this.sndQueueLimit = sndQueueLimit;
this.msgQueueLsnr = msgQueueLsnr;
- this.gridName = gridName;
filterChain = new GridNioFilterChain<>(log, lsnr, new HeadFilter(), filters);
@@ -1644,8 +1639,7 @@ public class GridNioServer<T> {
req.accepted(),
sndQueueLimit,
writeBuf,
- readBuf,
- gridName);
+ readBuf);
Map<Integer, ?> meta = req.meta();
http://git-wip-us.apache.org/repos/asf/ignite/blob/69f9c9ea/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
index 5ce1e1e..360b3d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
@@ -77,7 +77,6 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl {
* @param sndQueueLimit Send queue limit.
* @param writeBuf Write buffer.
* @param readBuf Read buffer.
- * @param gridName Grid name.
*/
GridSelectorNioSessionImpl(
IgniteLogger log,
@@ -88,8 +87,7 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl {
boolean accepted,
int sndQueueLimit,
@Nullable ByteBuffer writeBuf,
- @Nullable ByteBuffer readBuf,
- String gridName
+ @Nullable ByteBuffer readBuf
) {
super(filterChain, locAddr, rmtAddr, accepted);