commit 20f4f0d867ee3e9b821e4bd0599b027ed195ce22
author David Pursehouse <dpursehouse@collab.net> Wed Apr 03 15:06:05 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed Apr 03 15:06:05 2019 +0900
tree 5e79a06f745bde2c947a1aca826f22ddaa3c5781
parent b4253190d385cdf32f2f2654e5e782cd65ec9acc
parent b9210f36d5303ba15068998fe7ffb7ac6a81fd5e

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update bazlets to latest revision on stable-2.14

Change-Id: I4f3a0420065c5a751e015295cd5bd1a1a2ef322e

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 5e0ac2a..9877ec6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "8d7664e169100e537340aed89345c3245cf12f22",
+    commit = "f4fcc606a6afa8ce27a013bcf62e495a5ec2505c",
     #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 111f447..c665c7a 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 hearbeat event: " + e.getMessage(), e);
       }
     }