commit 80612676af5bae855a869631eab839d9208ccdbd
author David Pursehouse <dpursehouse@collab.net> Tue Nov 05 14:16:59 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue Nov 05 14:16:59 2019 +0900
tree 762dc29c7aa5862f8b01424cd4e4f374de0ddb61
parent 16d84904b5ef5de66824733727502c6b38b239ad
parent 2372d0d22d6fe4fc4aaf85fc5eb5b41fc1546e8e

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade bazlets to latest stable-2.14

Change-Id: I742f0460c696b7581635ef73a28a3dc447a70ed7

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 036608c..8764da6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "e48c6a61d5a3f9ab4589f324fc85b8e3777d8854",
+    commit = "d735ef54dfd38f99106d5635228156139c0b57fd",
     #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);
       }
     }