commit 6129cc86205b70754f8b2944253ecb4abbba71d1
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> Thu Jul 05 20:33:51 2018 -0400
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> Thu Jul 05 20:33:51 2018 -0400
tree 8e813bb924cfc6de30f9a06508a6acd7df8f9c75
parent 28eac81d9107eea16543613ef01dcecbc6ac4570
parent bd6c9eba5d43ad2d79a84909feef36d22389d636

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Remove use of Thread.sleep
  Use logger built-in format

Change-Id: Id0c679494b7132fc6f21bc820817d0ed1c176802

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index dd94def..ae0ab8d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "11ce7521051ca73598d099aa8a396c9ffe932a74",
+    commit = "60296e8f7162f279e3885a92014bc69252935612",
     #    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);
       }
     }