You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/23 11:35:14 UTC
[1/2] git commit: updated refs/heads/master to 36d0bfd
Repository: cloudstack
Updated Branches:
refs/heads/master a6b6f4104 -> 36d0bfdec
CID 1338016: multi catch instead of pokemon
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2fb01b67
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2fb01b67
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2fb01b67
Branch: refs/heads/master
Commit: 2fb01b67ad833f398f35919bdee45115e177ca4d
Parents: ea7c2d9
Author: Daan Hoogland <ho...@daan.cc>
Authored: Sun Nov 1 19:40:48 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Nov 16 18:33:32 2015 +0100
----------------------------------------------------------------------
server/src/com/cloud/storage/VolumeApiServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fb01b67/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index 6fe0a14..8f29167 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1255,7 +1255,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
volOnCache.delete();
}
- } catch (Exception e) {
+ } catch (InterruptedException | ExecutionException | NoTransitionException e) {
s_logger.warn("Failed to expunge volume:", e);
return false;
}
[2/2] git commit: updated refs/heads/master to 36d0bfd
Posted by re...@apache.org.
Merge pull request #1018 from DaanHoogland/CID-1338016
CID 1338016: multi catch instead of pokemon
* pr/1018:
CID 1338016: multi catch instead of pokemon
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/36d0bfde
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/36d0bfde
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/36d0bfde
Branch: refs/heads/master
Commit: 36d0bfdecf03345e703f324919d4bb02c292840d
Parents: a6b6f41 2fb01b6
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Nov 23 11:34:23 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Nov 23 11:34:24 2015 +0100
----------------------------------------------------------------------
server/src/com/cloud/storage/VolumeApiServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------