ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: 1093
Date Thu, 17 Sep 2015 14:12:23 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1093-2 7e42853d1 -> 03bc9d93b


1093


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

Branch: refs/heads/ignite-1093-2
Commit: 03bc9d93ba0fbcb61e015da099597c77cdd42012
Parents: 7e42853
Author: Anton Vinogradov <av@apache.org>
Authored: Thu Sep 17 17:12:07 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Thu Sep 17 17:12:07 2015 +0300

----------------------------------------------------------------------
 .../distributed/dht/preloader/GridDhtPartitionSupplier.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/03bc9d93/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
index ad4c171..fb9f796 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
@@ -150,7 +150,10 @@ class GridDhtPartitionSupplier {
 
             if (it != null && it instanceof GridCloseableIterator && !((GridCloseableIterator)it).isClosed())
{
                 try {
-                    ((GridCloseableIterator)it).close();//todo: is it ok to close twice?
+                    synchronized (map) {
+                        if (!((GridCloseableIterator)it).isClosed())
+                            ((GridCloseableIterator)it).close();
+                    }
                 }
                 catch (IgniteCheckedException e) {
                     log.error("Iterator close failed.", e);


Mime
View raw message