Repository: cxf Updated Branches: refs/heads/master a6eb7eb75 -> f31f32bbc
[CXF-7474] Tweaking a bit the default UI resolution processas suggested by Vadim Beilin Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f31f32bb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f31f32bb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f31f32bb Branch: refs/heads/master Commit: f31f32bbce24ae39c15976fde5a71d3cd51b6d6d Parents: a6eb7eb Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Tue Aug 29 12:18:40 2017 +0100 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Tue Aug 29 12:18:40 2017 +0100 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/swagger/SwaggerUiResolver.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f31f32bb/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java index 60f7d20..fbca07a 100644 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java +++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java @@ -52,14 +52,13 @@ public class SwaggerUiResolver { return root; } } - } else { - Enumeration<URL> urls = cl.getResources(UI_RESOURCES_ROOT_START); - while (urls.hasMoreElements()) { - String urlStr = urls.nextElement().toString().replace(UI_RESOURCES_ROOT_START, ""); - String root = checkUiRoot(urlStr, swaggerUiMavenGroupAndArtifact, swaggerUiVersion); - if (root != null) { - return root; - } + } + Enumeration<URL> urls = cl.getResources(UI_RESOURCES_ROOT_START); + while (urls.hasMoreElements()) { + String urlStr = urls.nextElement().toString().replace(UI_RESOURCES_ROOT_START, ""); + String root = checkUiRoot(urlStr, swaggerUiMavenGroupAndArtifact, swaggerUiVersion); + if (root != null) { + return root; } } } catch (Throwable ex) {
