commit f7f397cefff8f195d03efd8010eebeedb9efd586
author Luca Milanesio <luca.milanesio@gmail.com> Wed Nov 14 16:26:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 14 16:26:48 2018 +0000
tree b539cbf286d0bc207858f9eb8a31784587d2e0db
parent d84853d62d75156494dc2e2468ea446d106aa48a
parent aea7954e2d0005770947672c2c8957568d4dc9d9

Merge "Harmonize how REST API handlers get a JSON body" into stable-2.15

BUILD

diff --git a/BUILD b/BUILD
index 7fec2ea..7d5fad8 100644
--- a/BUILD
+++ b/BUILD
@@ -13,6 +13,7 @@
         "Gerrit-PluginName: high-availability",
         "Gerrit-Module: com.ericsson.gerrit.plugins.highavailability.Module",
         "Gerrit-HttpModule: com.ericsson.gerrit.plugins.highavailability.HttpModule",
+        "Gerrit-InitStep: com.ericsson.gerrit.plugins.highavailability.Setup",
         "Implementation-Title: high-availability plugin",
         "Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/high-availability",
     ],

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index a319b6f..20253d9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "087da1f6ca119ad5c4bc443926426ddf44dcde3a",
+    commit = "b54eaed487d37188120da6933b97c571519954ca",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheTest.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheTest.java
index 47ced48..bccf300 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebSessionCacheTest.java
@@ -127,7 +127,7 @@
   public void getIfPresentInvalidKeyTest() throws Exception {
     loadKeyToCacheDir(INVALID_KEY);
     Path path = websessionDir.resolve(INVALID_KEY);
-    assertThat(cache.getIfPresent(path)).isNull();
+    assertThat(cache.getIfPresent((Object) path)).isNull();
   }
 
   @Test