commit 6f3ff6699c3e8d5aee0d69651578e4cebbc7353a
author Marco Miller <marco.miller@ericsson.com> Thu Sep 12 12:26:39 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Thu Sep 12 12:26:39 2019 -0400
tree 2f0aac23e72a59b3c6c02bd9bcc834cddaa71359
parent 7faccd2098ded07f6ec6ffef8d8e7a6cbc8e465e
parent d91c5dd886d6245039e13fd28261bb08a2950dea

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Bump required bazel version to 1.0.0rc2
  Upgrade bazlets to latest stable-2.14

Change-Id: Ic2ec1d8a11400ec70a217363115a8137397fe162

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 33d8d20..a75cd3c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "bec81c8319e560d2a92ba0fe35d40d021ffd7708",
+    commit = "1aa9482d30e8873e6d3e1e75dc307a43aae0482e",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java b/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java
index 63c2f84..7752993 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java
@@ -17,6 +17,7 @@
 import com.google.gerrit.common.EventDispatcher;
 import com.google.gerrit.extensions.events.LifecycleListener;
 import com.google.gerrit.extensions.registration.DynamicItem;
+import com.google.gerrit.server.permissions.PermissionBackendException;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -65,7 +66,7 @@
     public void run() {
       try {
         dispatcher.get().postEvent(new HeartbeatEvent());
-      } catch (OrmException e) {
+      } catch (OrmException | PermissionBackendException e) {
         logger.error("Failed to post heartbeat event: {}", e.getMessage(), e);
       }
     }