diff options
| author |   YuanHu <yuan.hu1@zte.com.cn> | 2016-10-13 15:16:05 +0800 |
|---|---|---|
| committer |   huangjian <huang.jian12@zte.com.cn> | 2016-10-17 20:28:58 +0800 |
| commit | 7d729e31bae00ad5b074de3346e98aa89cccbba3 (patch) | |
| tree | 844e774f8497441cc7f8ce87aca4cf5a7fbb85c2 /catalog-core | |
| parent | 10a0bf3a21ff45edf27fa9f5caf166588681a371 (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>
Diffstat (limited to 'catalog-core')
| -rw-r--r-- | catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/AbstractModelParser.java | 6 |
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) { |