Repository: incubator-ignite Updated Branches: refs/heads/ignite-320 [created] e6f9e3474
# IGNITE-320 Fix CacheExpiryTest.iteratorNextShouldCallGetExpiryForAccessedEntry() Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e6f9e347 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e6f9e347 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e6f9e347 Branch: refs/heads/ignite-320 Commit: e6f9e3474573ad06b89dc2fb26e48f13e20afb2b Parents: 036bd71 Author: sevdokimov <sergey.evdoki...@jetbrains.com> Authored: Sun Mar 1 21:11:39 2015 +0300 Committer: sevdokimov <sergey.evdoki...@jetbrains.com> Committed: Sun Mar 1 21:11:39 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheStoreManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e6f9e347/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java index 9262a8f..c768f54 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java @@ -616,6 +616,9 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { handleClassCastException(e); } catch (Exception e) { + if (!(e instanceof CacheWriterException)) + e = new CacheWriterException(e); + if (!entries.isEmpty()) { List<Object> keys = new ArrayList<>(entries.size()); @@ -625,9 +628,6 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { throw new CacheStorePartialUpdateException(keys, e); } - if (!(e instanceof CacheWriterException)) - e = new CacheWriterException(e); - throw new IgniteCheckedException(e); } finally { @@ -725,12 +725,12 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { handleClassCastException(e); } catch (Exception e) { - if (!keys0.isEmpty()) - throw new CacheStorePartialUpdateException(keys0, e); - if (!(e instanceof CacheWriterException)) e = new CacheWriterException(e); + if (!keys0.isEmpty()) + throw new CacheStorePartialUpdateException(keys0, e); + throw new IgniteCheckedException(e); } finally {
