From 1de10dd6dfd68dd06713d2c22350429dcdffb850 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Tue, 7 Oct 2014 08:05:27 +0200
Subject: [PATCH] CLOUDSTACK-7674 throw an exception when encountered
 Conflicts: 	engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java

---
 .../schema/src/com/cloud/upgrade/dao/Upgrade430to431.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java
index b80dbe0ae01..ad04617ff44 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java
@@ -58,8 +58,8 @@ public class Upgrade430to431 implements DbUpgrade {
 
     private void updateVlanUris(Connection conn) {
         s_logger.debug("updating vlan URIs");
-        Exception thrown = null;
-        PreparedStatement selectstatement = null;
+        CloudRuntimeException thrown = null;
+    	PreparedStatement selectstatement = null;
         ResultSet results = null;
         try{
             selectstatement = conn.prepareStatement("SELECT id, vlan_id FROM `cloud`.`vlan` where vlan_id not like '%:%'");
@@ -113,6 +113,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");
     }