# Ignite-639 Merge with sprint-3.

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

Branch: refs/heads/ignite-452
Commit: 03a2b3f91f293662f3bdd89d2dd48c05545e22c9
Parents: 8e486f9
Author: AKuznetsov <akuznet...@gridgain.com>
Authored: Fri Apr 3 22:30:56 2015 +0700
Committer: AKuznetsov <akuznet...@gridgain.com>
Committed: Fri Apr 3 22:30:56 2015 +0700

----------------------------------------------------------------------
 .../ignite/internal/visor/cache/VisorCacheConfiguration.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03a2b3f9/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 88edbaa..d3696fe 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -117,14 +117,14 @@ public class VisorCacheConfiguration implements 
Serializable {
     private VisorCacheQueryConfiguration qryCfg;
 
     /** System cache state. */
-    private boolean system;
+    private boolean sys;
 
     /**
      * @param ignite Grid.
      * @param ccfg Cache configuration.
      * @return Data transfer object for cache configuration properties.
      */
-    public VisorCacheConfiguration from(Ignite ignite, CacheConfiguration 
ccfg) {
+    public VisorCacheConfiguration from(IgniteEx ignite, CacheConfiguration 
ccfg) {
         name = ccfg.getName();
         mode = ccfg.getCacheMode();
         atomicityMode = ccfg.getAtomicityMode();
@@ -145,7 +145,7 @@ public class VisorCacheConfiguration implements 
Serializable {
         ldrFactory = compactClass(ccfg.getCacheLoaderFactory());
         writerFactory = compactClass(ccfg.getCacheWriterFactory());
         expiryPlcFactory = compactClass(ccfg.getExpiryPolicyFactory());
-        system = ignite.systemCache(ccfg.getName());
+        sys = ignite.systemCache(ccfg.getName());
         
         affinityCfg = VisorCacheAffinityConfiguration.from(ccfg);
         rebalanceCfg = VisorCacheRebalanceConfiguration.from(ccfg);
@@ -358,7 +358,7 @@ public class VisorCacheConfiguration implements 
Serializable {
      * @return System cache state.
      */
     public boolean system() {
-        return system;
+        return sys;
     }
 
     /** {@inheritDoc} */

Reply via email to