| commit | ab8b1b258477a5d04a389dd56b5583e13ec675ea | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Mon Nov 12 16:22:00 2018 -0800 |
| committer | David Pursehouse <dpursehouse@collab.net> | Mon Nov 12 16:22:00 2018 -0800 |
| tree | b9b562e27cecf903428bccbfe4c325e8f591dfd1 | |
| parent | c8c356e64712944624f099693b2f65f630ab900a [diff] | |
| parent | d555fb8e490068f04268f391438c7e7ac7f2ae48 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: FileBasedWebSessionCacheTest: Fix IncompatibleArgumentType error Upgrade bazlets to latest stable-2.14 to build with 2.14.17 API Change-Id: I92e226be81a462d3793ae996faf86acfa5d8d89e
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