This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new 701aebc Fixing the bug of load client loading storage resources before certificate
initialization
701aebc is described below
commit 701aebce283da9eb8ee558030d04d16f33d78901
Author: Dimuthu Wannipurage <dimuthu.upeksha2@gmail.com>
AuthorDate: Fri Jan 4 13:08:35 2019 -0500
Fixing the bug of load client loading storage resources before certificate initialization
---
.../src/main/java/org/apache/airavata/tools/load/LoadClient.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java
b/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java
index e7186da..16d96d0 100644
--- a/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java
+++ b/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java
@@ -31,17 +31,16 @@ public class LoadClient {
try (InputStream in = LoadClient.class.getResourceAsStream("/conf/load-config.yml"))
{
Yaml yaml = new Yaml();
configurations = yaml.loadAs(in, Configurations.class);
- createStorageResourceManagers(configurations);
}
} else {
try (InputStream in = new FileInputStream(configFile)) {
Yaml yaml = new Yaml();
configurations = yaml.loadAs(in, Configurations.class);
- createStorageResourceManagers(configurations);
}
}
securityManager.loadCertificate(configurations.getApiHost(), configurations.getApiPort());
+ createStorageResourceManagers(configurations);
}
public void start() throws Exception {
|