summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-05-04 16:19:42 +0200
committergjoranv <gv@oath.com>2018-05-09 13:24:43 +0200
commitdaf1d91787258738e7f8687aa995ec25e0eba20c (patch)
tree4c457c2dc11d1b14a0d171474baa2cbc35cdcb7a /configserver
parenta188014e726bcb5aaf9519ed95d440cf311596bc (diff)
Java 9: Suppress deprecation warning for finalize()
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java
index 12cc76afc6b..32602ab70b8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java
@@ -1,7 +1,6 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.config.server.session;
-import com.yahoo.config.provision.ApplicationId;
import com.yahoo.jrt.Supervisor;
import com.yahoo.jrt.Transport;
import com.yahoo.vespa.config.server.filedistribution.FileDistributionProvider;
@@ -23,6 +22,7 @@ public class FileDistributionFactory {
}
@Override
+ @SuppressWarnings("deprecation") // finalize() is deprecated from Java 9
protected void finalize() throws Throwable {
super.finalize();
supervisor.transport().shutdown().join();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
index b0dce359d58..a4d26ad6cd4 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
@@ -113,6 +113,7 @@ public class FileServerTest {
}
@Override
+ @SuppressWarnings("deprecation") // finalize() is deprecated from Java 9
protected void finalize() throws Throwable {
super.finalize();
cleanup();