ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [03/50] [abbrv] incubator-ignite git commit: # IGNITE-639 minor changes.
Date Thu, 09 Apr 2015 16:22:34 GMT
# IGNITE-639 minor changes.


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

Branch: refs/heads/gg-10046
Commit: 5e9addb568125d8ce5b375c64169178e8fc85137
Parents: 4d44e61
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Wed Apr 8 18:05:42 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Wed Apr 8 18:05:42 2015 +0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/internal/IgniteEx.java   | 2 +-
 .../internal/visor/cache/VisorCacheMetricsCollectorTask.java | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e9addb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
index bea4ab5..867e26d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
@@ -117,7 +117,7 @@ public interface IgniteEx extends Ignite {
     public Hadoop hadoop();
 
     /** {@inheritDoc} */
-    @Override public IgniteClusterEx cluster();
+    @Override IgniteClusterEx cluster();
 
     /**
      * Get latest version in string form.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e9addb5/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index ee0b962..8fd42a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -109,13 +109,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
                 if (ca.context().started()) {
                     VisorCacheMetrics cm = VisorCacheMetrics.from(ignite, ca);
 
-                    boolean addCache = allCaches || cacheNames.contains(ca.name());
-
-                    if (showSysCaches) {
-                        if (cm.system() && addCache)
-                            res.add(cm);
-                    }
-                    else if (!cm.system() && addCache)
+                    if ((allCaches || cacheNames.contains(ca.name())) && (showSysCaches
|| !cm.system()))
                         res.add(cm);
                 }
             }


Mime
View raw message