diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-09-10 09:27:22 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-09-10 09:27:22 +0200 |
commit | 80476877f811f0a90cc1e692d56b5fbd11fbe76c (patch) | |
tree | 8b6451c43e3d90bc0ddf9fbcf268dcbd6d1c2a05 /container-core | |
parent | 48f9a4071b5f6f75114cd1b94eb09bec36f77061 (diff) |
Use fileAcquirer
Diffstat (limited to 'container-core')
-rwxr-xr-x | container-core/src/main/java/com/yahoo/container/Container.java | 4 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/Container.java b/container-core/src/main/java/com/yahoo/container/Container.java index efe7c58563c..7e5ea7bd948 100755 --- a/container-core/src/main/java/com/yahoo/container/Container.java +++ b/container-core/src/main/java/com/yahoo/container/Container.java @@ -145,7 +145,7 @@ public class Container { /** * Only for internal use. */ - public void setCustomFileAcquirer(final FileAcquirer fileAcquirer) { + public void setCustomFileAcquirer(FileAcquirer fileAcquirer) { if (this.fileAcquirer != null) { throw new RuntimeException("Can't change file acquirer. Is " + this.fileAcquirer + " attempted to set to " + fileAcquirer); @@ -155,7 +155,7 @@ public class Container { setPathAcquirer(fileAcquirer); } - private static void setPathAcquirer(final FileAcquirer fileAcquirer) { + private static void setPathAcquirer(FileAcquirer fileAcquirer) { ConfigTransformer.setPathAcquirer(fileReference -> { try { return fileAcquirer.waitFor(fileReference, 15, TimeUnit.MINUTES).toPath(); diff --git a/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java index c0a68086212..557f331395b 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java @@ -41,8 +41,7 @@ public class BundleLoader { initialBundles = Arrays.asList(osgi.getBundles()); } - private List<Bundle> obtainBundles(FileReference reference, FileAcquirer fileAcquirer) - throws InterruptedException { + private List<Bundle> obtainBundles(FileReference reference, FileAcquirer fileAcquirer) throws InterruptedException { File file = fileAcquirer.waitFor(reference, 7, TimeUnit.DAYS); return osgi.install(file.getAbsolutePath()); } |