diff options
author | Harald Musum <musum@oath.com> | 2017-11-14 08:19:04 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2017-11-14 08:19:04 +0100 |
commit | 6a9c6010fb290a7343285b44827cb9a7fa558bff (patch) | |
tree | a9e2346b0c7f203ca9060868279690a2aa92591b /configserver/src | |
parent | 795122be6d0676bbedf99d2413d1db2c2b64098a (diff) |
Register receiveFile with the client supervisor
Since the server will use the same connection to call receiveFile
after the client have called serveFile we need to register the RPC
method using the same supervisor as the client uses.
Also some preparations for making the code more reusable for others.
Diffstat (limited to 'configserver/src')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java | 4 |
1 files changed, 1 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 79c541d7b1a..0d1aae97690 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,9 +15,7 @@ public class ApplicationFileManager implements AddFileInterface { @Override public FileReference addFile(String relativePath, FileReference reference) { - // TODO Wire in when verified in system test - // return master.addFile(new File(applicationDir, relativePath), reference); - return reference; + return master.addFile(new File(applicationDir, relativePath), reference); } @Override |