Fix exceptions from result iterator too.

horde · May 24, 2017 · 1e1ce3b · 1e1ce3b
1 parent c1021e5
commit 1e1ce3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/framework/Alarm/lib/Horde/Alarm/Sql.php b/framework/Alarm/lib/Horde/Alarm/Sql.php
@@ -81,19 +81,18 @@ protected function _list($user, Horde_Date $time)
             $values[] = (string)$user;
         }
 
+        $alarms = array();
         try {
             $result = $this->_db->select($query, $values);
+            foreach ($result as $val) {
+                $alarms[] = $this->_getHash($val);
+            }
         } catch (Horde_Db_Exception $e) {
             throw new Horde_Alarm_Exception(
                 Horde_Alarm_Translation::t("Server error when querying database.")
             );
         }
 
-        $alarms = array();
-        foreach ($result as $val) {
-            $alarms[] = $this->_getHash($val);
-        }
-
         return $alarms;
     }
 

diff --git a/framework/Alarm/package.xml b/framework/Alarm/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [jan] Fix catching database backend exceptions.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1026,7 +1026,7 @@
    <date>2017-05-03</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [jan] Fix catching database backend exceptions.
    </notes>
   </release>
  </changelog>