diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-11-10 13:55:17 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-11-13 11:00:55 +0100 |
| commit | b8c6d8863002771ef90dd8fc03843ad553a8fced (patch) | |
| tree | 2f36420ac21c2de1789a7d104e3ed579ae7ebcc1 /configserver | |
| parent | db94506b9859f56498bb729ac0d2657d0fe28777 (diff) | |
Pend the wiring at a better place.
Diffstat (limited to 'configserver')
2 files changed, 4 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java index 0d1aae97690..79c541d7b1a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java @@ -15,7 +15,9 @@ public class ApplicationFileManager implements AddFileInterface { @Override public FileReference addFile(String relativePath, FileReference reference) { - return master.addFile(new File(applicationDir, relativePath), reference); + // TODO Wire in when verified in system test + // return master.addFile(new File(applicationDir, relativePath), reference); + return reference; } @Override diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/CombinedLegacyRegistry.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/CombinedLegacyRegistry.java index 1f5b19290fe..8f2cb194bbd 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/CombinedLegacyRegistry.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/CombinedLegacyRegistry.java @@ -17,8 +17,7 @@ public class CombinedLegacyRegistry implements FileRegistry { @Override public FileReference addFile(String relativePath) { FileReference reference = legacy.addFile(relativePath); - // TODO: Enable when system tested future.addFile(relativePath, reference); - return reference; + return future.addFile(relativePath, reference); } @Override |