ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [35/50] incubator-ignite git commit: # IGNITE-709 Introduce TcpDiscoverySpiAdapter.injectables()
Date Fri, 29 May 2015 12:46:42 GMT
# IGNITE-709 Introduce TcpDiscoverySpiAdapter.injectables()


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

Branch: refs/heads/ignite-929
Commit: 2e52adf6a59923695ae444e917cb3283a200a641
Parents: e575164
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Tue May 26 15:20:46 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Tue May 26 15:20:46 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java  | 5 -----
 .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java    | 5 -----
 .../apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 5 +++++
 3 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e52adf6/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index de954d8..1cf044e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -390,11 +390,6 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<Object> injectables() {
-        return F.<Object>asList(ipFinder);
-    }
-
-    /** {@inheritDoc} */
     @Override public Collection<ClusterNode> getRemoteNodes() {
         return U.arrayList(rmtNodes.values(), TcpDiscoveryNodesRing.VISIBLE_NODES);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e52adf6/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 34e1ca8..6bad0f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -646,11 +646,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<Object> injectables() {
-        return F.<Object>asList(ipFinder);
-    }
-
-    /** {@inheritDoc} */
     @Override public void spiStart(String gridName) throws IgniteSpiException {
         spiStart0(false);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e52adf6/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
index d922761..5bfd378 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
@@ -355,6 +355,11 @@ public abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter
implements
     }
 
     /** {@inheritDoc} */
+    @Override public Collection<Object> injectables() {
+        return F.<Object>asList(ipFinder);
+    }
+
+    /** {@inheritDoc} */
     @Override protected void onContextInitialized0(IgniteSpiContext spiCtx) throws IgniteSpiException
{
         super.onContextInitialized0(spiCtx);
 


Mime
View raw message