From 03ad2508f945230c9cee085c5defdba7ec64a11c Mon Sep 17 00:00:00 2001 From: YuanHu Date: Thu, 13 Oct 2016 15:16:05 +0800 Subject: [PATCH] The url of http server via msb is started with 'files/catalog-http'. Change-Id: Ifdd6a3283d5ed95a70903703a59eab5036c7fbd9 Issue-id: TOSCA-108 Signed-off-by: YuanHu --- .../openo/commontosca/catalog/model/parser/AbstractModelParser.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) { -- 2.16.6