Handle failure to retrieve the alarm by Id by returning null instead of a NullPointerException

2014-05-05 21:15:18 -06:00 · 2014-05-05 21:15:18 -06:00 · 6776df2319
commit 6776df2319
parent 7c6394b1f8
1 changed files with 2 additions and 0 deletions
--- a/src/main/java/com/hpcloud/mon/infrastructure/persistence/AlarmDAOImpl.java
+++ b/src/main/java/com/hpcloud/mon/infrastructure/persistence/AlarmDAOImpl.java
@ -83,6 +83,8 @@ public class AlarmDAOImpl implements AlarmDAO {
          .bind("id", id)
          .map(new BeanMapper<Alarm>(Alarm.class))
          .first();
+      if (alarm == null)
+        return alarm;

      alarm.setSubAlarms(subAlarmsForRows(
          h,