diff options
| author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-07-04 08:41:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-04 08:41:34 +0200 |
| commit | d28eab9a181f634005ffa7d792e2bd29c1730fb1 (patch) | |
| tree | 774039fcf22a534fa6622d0cefc75f8db49f794c | |
| parent | bef3f6e443e52daa62ec53deb213e201810dabf8 (diff) | |
| parent | e46b7747e6e039f495481fd88cc50130922ad857 (diff) | |
Merge pull request #2912 from yahoo/bratseth/make-mock-accessible
Make mock accessible
| -rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java | 3 | ||||
| -rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/curator/mock/package-info.java | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index d1bae4cdae0..01ff6918f7b 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -140,8 +140,7 @@ public class HandlersConfigurerDi { public void useBundles(Collection<FileReference> bundles) { log.info("Installing bundles from the latest application"); - List<FileReference> fileReferences = new ArrayList<>(bundles); - int bundlesRemovedOrInstalled = bundleLoader.use(fileReferences); + int bundlesRemovedOrInstalled = bundleLoader.use(new ArrayList<>(bundles)); if (bundlesRemovedOrInstalled > 0) { refreshPackages(); diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/package-info.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/package-info.java new file mode 100644 index 00000000000..6f21d15daf2 --- /dev/null +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/package-info.java @@ -0,0 +1,5 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +@ExportPackage +package com.yahoo.vespa.curator.mock; + +import com.yahoo.osgi.annotation.ExportPackage; |