ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-2350
Date Wed, 13 Jan 2016 11:22:48 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2350 04d0ed66b -> 9c36c17b7


ignite-2350


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

Branch: refs/heads/ignite-2350
Commit: 9c36c17b772bd3d30c466a362b786a7b5c21e566
Parents: 04d0ed6
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Jan 13 14:22:36 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Jan 13 14:22:36 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cluster/GridUpdateNotifier.java | 2 +-
 .../processors/cluster/GridUpdateNotifierSelfTest.java         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9c36c17b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
index aa87ac9..2e2f9e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java
@@ -66,7 +66,7 @@ class GridUpdateNotifier {
     private static final String CHARSET = "UTF-8";
 
     /** Access URL to be used to access latest version data. */
-    private static final String UPD_STATUS_PARAMS = IgniteProperties.get("ignite.update.status.params");
+    private final String UPD_STATUS_PARAMS = IgniteProperties.get("ignite.update.status.params");
 
     /** Throttling for logging out. */
     private static final long THROTTLE_PERIOD = 24 * 60 * 60 * 1000; // 1 day.

http://git-wip-us.apache.org/repos/asf/ignite/blob/9c36c17b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
index 1ae98f6..21b91b6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
@@ -87,7 +87,7 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest {
             ver = ntf.latestVersion();
         }
 
-        info("Latest version: " + ver);
+        info("Notifier version [ver=" + ver + ", nodeVer=" + nodeVer + ']');
 
         assertNotNull("Ignite latest version has not been detected.", ver);
 
@@ -95,8 +95,8 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest {
 
         byte lastMaintenance = IgniteProductVersion.fromString(ver).maintenance();
 
-        assertTrue("Wrong latest version.", (nodeMaintenance == 0 && lastMaintenance
== 0) ||
-            (nodeMaintenance > 0 && lastMaintenance > 0));
+        assertTrue("Wrong latest version [nodeVer=" + nodeMaintenance + ", lastVer=" + lastMaintenance
+ ']',
+            (nodeMaintenance == 0 && lastMaintenance == 0) || (nodeMaintenance >
0 && lastMaintenance > 0));
 
         ntf.reportStatus(log);
     }


Mime
View raw message