You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/01 19:23:55 UTC
[04/50] incubator-ignite git commit: # IGNITE-943 Fix IDEA's warnings.
# IGNITE-943 Fix IDEA's warnings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/982cb0ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/982cb0ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/982cb0ca
Branch: refs/heads/ignite-218
Commit: 982cb0ca1acd1e34f79a387f41d4b25e34e4faab
Parents: e66578e
Author: sevdokimov <se...@gridgain.com>
Authored: Wed May 27 18:25:36 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed May 27 18:25:36 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 2 ++
.../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 9 +++++----
.../apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/982cb0ca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 455b2af..aa254ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -541,6 +541,7 @@ class ClientImpl extends TcpDiscoveryImpl {
U.closeQuiet(msgWorker.currSock);
}
+ /** {@inheritDoc} */
@Override protected IgniteSpiThread workerThread() {
return msgWorker;
}
@@ -548,6 +549,7 @@ class ClientImpl extends TcpDiscoveryImpl {
/**
* FOR TEST PURPOSE ONLY!
*/
+ @SuppressWarnings("BusyWait")
public void waitForClientMessagePrecessed() {
Object last = msgWorker.queue.peekLast();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/982cb0ca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 2cd8212..184895b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -55,6 +55,7 @@ import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusChe
/**
*
*/
+@SuppressWarnings("NonPrivateFieldAccessedInSynchronizedContext")
class ServerImpl extends TcpDiscoveryImpl {
/** */
private final Executor utilityPool = new ThreadPoolExecutor(0, 1, 2000, TimeUnit.MILLISECONDS,
@@ -416,7 +417,7 @@ class ServerImpl extends TcpDiscoveryImpl {
DiscoverySpiListener lsnr = adapter.lsnr;
if (lsnr != null) {
- Set<ClusterNode> processed = new HashSet<>();
+ Collection<ClusterNode> processed = new HashSet<>();
for (TcpDiscoveryNode n : rmts) {
assert n.visible();
@@ -1412,7 +1413,7 @@ class ServerImpl extends TcpDiscoveryImpl {
}
/** {@inheritDoc} */
- public void dumpDebugInfo(IgniteLogger log) {
+ @Override public void dumpDebugInfo(IgniteLogger log) {
if (!debugMode) {
U.quietAndWarn(log, "Failed to dump debug info (discovery SPI was not configured " +
"in debug mode, consider setting 'debugMode' configuration property to 'true').");
@@ -2040,12 +2041,12 @@ class ServerImpl extends TcpDiscoveryImpl {
final boolean sameHost = U.sameMacs(locNode, next);
- List<InetSocketAddress> localNodeAddresses = U.arrayList(locNode.socketAddresses());
+ List<InetSocketAddress> locNodeAddrs = U.arrayList(locNode.socketAddresses());
addr: for (InetSocketAddress addr : adapter.getNodeAddresses(next, sameHost)) {
long ackTimeout0 = adapter.ackTimeout;
- if (localNodeAddresses.contains(addr)){
+ if (locNodeAddrs.contains(addr)){
if (log.isDebugEnabled())
log.debug("Skip to send message to the local node (probably remote node has the same " +
"loopback address that local node): " + addr);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/982cb0ca/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 93a1ec3..d995717 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
@@ -1613,7 +1613,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
* @return {@code True} if node is stopping.
*/
boolean isNodeStopping0() {
- return super.isNodeStopping();
+ return isNodeStopping();
}
/**