commit 66b1c84b01d0a6e0d9e05292eb485e8ba1ef7848
author Marco Miller <marco.miller@ericsson.com> Fri Sep 28 17:10:23 2018 -0400
committer Marco Miller <marco.miller@ericsson.com> Fri Sep 28 17:10:23 2018 -0400
tree 3470f7bef621272c641f28b2df91bb637f72f5bc
parent 6129cc86205b70754f8b2944253ecb4abbba71d1
parent bb00566f46cc955099db4b819245f41882aedc0d

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  HeartbeatConfigTest: Update file's google-java-format
  Format all Bazel build files with buildifier
  Update bazlets to latest stable-2.14 to build with 2.14.14 API
  Migrate `tools/bazel.rc` to `.bazelrc`
  Update bazlets to latest stable-2.14 to build with 2.14.13 API
  Update bazlets to latest stable-2.14 to use 2.14.12 API

Change-Id: I7568315a8e936ef9d4b0e68ff35f150805778cd1

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 0b129f1..ae0ab8d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "8faa61d19d53cc125ac7fd51eb213a496ab14f8d",
+    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);
       }
     }