aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuanHu <yuan.hu1@zte.com.cn>2016-10-13 15:16:05 +0800
committerYuanHu <yuan.hu1@zte.com.cn>2016-10-13 15:16:05 +0800
commit03ad2508f945230c9cee085c5defdba7ec64a11c (patch)
treec283f231ceb4bdba79245a7ba2228e26e14f0a94
parent9b07a4166f7a07424b53458dfd2e375c20bb0f3b (diff)
The url of http server via msb is started with 'files/catalog-http'.
Change-Id: Ifdd6a3283d5ed95a70903703a59eab5036c7fbd9 Issue-id: TOSCA-108 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
-rw-r--r--catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/AbstractModelParser.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/AbstractModelParser.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/AbstractModelParser.java
index f963d7b9..09c3e127 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/AbstractModelParser.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/AbstractModelParser.java
@@ -55,7 +55,11 @@ public abstract class AbstractModelParser {
}
public String getUrlOnHttpServer(String path) {
- return MsbAddrConfig.getMsbAddress() + "/" + path;
+ if (MsbAddrConfig.getMsbAddress().endsWith("/")) {
+ return MsbAddrConfig.getMsbAddress() + "files/catalog-http" + path;
+ } else {
+ return MsbAddrConfig.getMsbAddress() + "/files/catalog-http" + path;
+ }
}
protected String toTempFilePath(String fileLocation) {