Fix loading plugin resources without context path

When the context path is set to '/', we get an empty context
path. Nonetheless the URL has to start with a '/'. So we have
to add it explicitly, here.
This commit is contained in:
René Pfeuffer
2020-06-12 10:43:31 +02:00
parent 01164a247d
commit 6fea201cc7
2 changed files with 3 additions and 2 deletions

View File

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Avoid caching of detected browser language ([#1176](https://github.com/scm-manager/scm-manager/pull/1176))
- Fixes configuration of jetty listener address with system property `jetty.host` ([#1173](https://github.com/scm-manager/scm-manager/pull/1173), [#1174](https://github.com/scm-manager/scm-manager/pull/1174))
- Fixes loading plugin bundles with context path `/` ([#1182](https://github.com/scm-manager/scm-manager/pull/1182/files), [#1181](https://github.com/scm-manager/scm-manager/issues/1181))
## [2.0.0] - 2020-06-04
### Added

View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.api.v2.resources;
import com.google.common.base.Strings;
@@ -77,7 +77,7 @@ public class UIPluginDtoMapper {
private String addContextPath(String resource) {
String ctxPath = request.getContextPath();
if (Strings.isNullOrEmpty(ctxPath)) {
return resource;
return "/" + resource;
}
return HttpUtil.append(ctxPath, resource);
}