# Merge remote-tracking branch 'remotes/origin/master' into ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7de61e77 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7de61e77 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7de61e77 Branch: refs/heads/ignite-1 Commit: 7de61e77096e2927a21b7d6e39883a7def88e102 Parents: 5c629cf Author: sboikov <sboi...@gridgain.com> Authored: Fri Dec 12 12:28:11 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Dec 12 12:28:11 2014 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheProxy.java | 30 ++++++++++---------- .../java/org/gridgain/grid/GridSpringBean.java | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7de61e77/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 044f433..f582bd7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -101,7 +101,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -178,7 +178,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -213,7 +213,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -230,7 +230,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -261,7 +261,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -278,7 +278,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -295,7 +295,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -312,7 +312,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -329,7 +329,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -346,7 +346,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -363,7 +363,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -380,7 +380,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -397,7 +397,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -414,7 +414,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -431,7 +431,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable gate.leave(prev); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7de61e77/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java index d8c2734..ef8d948 100644 --- a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java +++ b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java @@ -313,7 +313,7 @@ public class GridSpringBean extends GridMetadataAwareAdapter implements Ignite, } /** {@inheritDoc} */ - @Override public void close() throws GridException { + @Override public void close() throws IgniteCheckedException { g.close(); }
