cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 36d0bfd
Date Mon, 23 Nov 2015 10:35:14 GMT
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 <hoogland@daan.cc>
Authored: Sun Nov 1 19:40:48 2015 +0100
Committer: Daan Hoogland <daan@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;
         }


Mime
View raw message