Repository: cloudstack Updated Branches: refs/heads/4.3 be3737824 -> 1a1190eb1
CLOUDSTACK-7674 throw an exception when encountered Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1a1190eb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1a1190eb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1a1190eb Branch: refs/heads/4.3 Commit: 1a1190eb1dea8057c4ac5fef7811c5f37d162954 Parents: be37378 Author: Daan Hoogland <d...@onecht.net> Authored: Tue Oct 7 08:05:27 2014 +0200 Committer: Daan Hoogland <d...@onecht.net> Committed: Tue Oct 7 08:05:27 2014 +0200 ---------------------------------------------------------------------- engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a1190eb/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java index 7f23cad..b8f1642 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java @@ -68,7 +68,7 @@ public class Upgrade430to431 implements DbUpgrade { private void updateVlanUris(Connection conn) { s_logger.debug("updating vlan URIs"); - Exception thrown = null; + CloudRuntimeException thrown = null; PreparedStatement selectstatement = null; ResultSet results = null; try{ @@ -123,6 +123,9 @@ public class Upgrade430to431 implements DbUpgrade { } //else don't obfuscate the original exception } } + if (thrown != null) { + throw thrown; + } s_logger.debug("Done updateing vlan URIs"); }
