ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject incubator-ignite git commit: ignite-49 review
Date Wed, 21 Jan 2015 16:42:00 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-49 1fd63cde8 -> 5598513c9


ignite-49 review


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

Branch: refs/heads/ignite-49
Commit: 5598513c9ed88c3c784f7cd31e5557f401e20343
Parents: 1fd63cd
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Wed Jan 21 19:41:54 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Wed Jan 21 19:41:54 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/IgniteCacheMXBean.java  |  3 ---
 .../main/java/org/apache/ignite/IgniteCacheManager.java | 12 ++++++------
 .../distributed/dht/atomic/GridDhtAtomicCache.java      |  1 -
 .../cache/local/atomic/GridLocalAtomicCache.java        |  1 -
 4 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5598513c/modules/core/src/main/java/org/apache/ignite/IgniteCacheMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCacheMXBean.java b/modules/core/src/main/java/org/apache/ignite/IgniteCacheMXBean.java
index 0c9d943..ae7662b 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCacheMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCacheMXBean.java
@@ -23,9 +23,6 @@ import javax.cache.management.*;
 
 /**
  * Implementation of {@link CacheMXBean}.
- *
- * It's a simple wrapper around {@link CompleteConfiguration CompleteConfiguration} for readonly
- * access to cache configuration.
  */
 public class IgniteCacheMXBean implements CacheMXBean {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5598513c/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java b/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
index fea39ca..b8dff8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
@@ -299,7 +299,8 @@ public class IgniteCacheManager implements CacheManager {
             registerCacheObject(mBeanSrv, tuple.get2(), cacheName, false);
 
             tuple.get1().cache(cacheName).configuration().setManagementEnabled(true);
-        } else {
+        }
+        else {
             unregisterCacheObject(mBeanSrv, cacheName, false);
 
             tuple.get1().cache(cacheName).configuration().setManagementEnabled(false);
@@ -354,8 +355,7 @@ public class IgniteCacheManager implements CacheManager {
                 mBeanServer.registerMBean(mxbean, registeredObjectName);
         }
         catch (Exception e) {
-            throw new CacheException("Error registering cache MXBeans for CacheManager "
-                + registeredObjectName.toString() + " . Error was " + e.getMessage(), e);
+            throw new CacheException("Failed to register MBean: " + registeredObjectName,
e);
         }
     }
 
@@ -384,9 +384,9 @@ public class IgniteCacheManager implements CacheManager {
         for (ObjectName registeredObjectName : registeredObjectNames) {
             try {
                 mBeanSrv.unregisterMBean(registeredObjectName);
-            } catch (Exception e) {
-                throw new CacheException("Error unregistering object instance " + registeredObjectName
-                        + " . Error was " + e.getMessage(), e);
+            }
+            catch (Exception e) {
+                throw new CacheException("Failed to unregister MBean: " + registeredObjectName,
e);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5598513c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 87e43ca..5345da2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -827,7 +827,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
         if (statsEnabled) {
             updateFut.listenAsync(new CI1<IgniteFuture<Object>>() {
-                /** {@inheritDoc} */
                 @Override public void apply(IgniteFuture<Object> fut) {
                     try {
                         if (!fut.isCancelled()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5598513c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
index a2a3b13..546690a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -841,7 +841,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
 
         if (statsEnabled)
             fut.listenAsync(new CI1<IgniteFuture<Boolean>>() {
-                /** {@inheritDoc} */
                 @Override public void apply(IgniteFuture<Boolean> fut) {
                     try {
                         if (!fut.isCancelled()) {


Mime
View raw message