You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/07/24 15:28:18 UTC
[1/2] incubator-ignite git commit: wider exception
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1.3.3 5082d63a3 -> eccaa47f4
wider exception
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1770f3c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1770f3c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1770f3c7
Branch: refs/heads/ignite-1.3.3
Commit: 1770f3c79cdcb54608e7a01677b0c7ed680976c8
Parents: ccebd43
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Jul 24 16:27:57 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Jul 24 16:27:57 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheSwapManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1770f3c7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
index 9e9c958..e95378b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
@@ -1971,7 +1971,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter {
}
}
}
- catch (IgniteCheckedException ex) {
+ catch (Exception ex) {
U.error(log, "Failed to process swap entry.", ex);
}
}
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-1.3.3' into ignite-1.3.3
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.3.3' into ignite-1.3.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/eccaa47f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eccaa47f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eccaa47f
Branch: refs/heads/ignite-1.3.3
Commit: eccaa47f4c74c5fa6f506684b82da4cd0f7664ba
Parents: 1770f3c 5082d63
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Jul 24 16:28:10 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Jul 24 16:28:10 2015 +0300
----------------------------------------------------------------------
.../GridClientConnectionManagerAdapter.java | 2 +-
.../client/router/impl/GridTcpRouterImpl.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 3 +-
.../util/nio/ssl/BlockingSslHandler.java | 37 ++++++++++-
.../internal/util/nio/ssl/GridNioSslFilter.java | 49 ++++----------
.../util/nio/ssl/GridNioSslHandler.java | 69 ++++++++++++++++++--
.../communication/tcp/TcpCommunicationSpi.java | 3 +-
.../internal/util/nio/GridNioSslSelfTest.java | 2 +-
8 files changed, 117 insertions(+), 50 deletions(-)
----------------------------------------------------------------------