Repository: cxf Updated Branches: refs/heads/master f31f32bbc -> 39bd1fe48
[CXF-7474] Removing the last change for now Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/39bd1fe4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/39bd1fe4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/39bd1fe4 Branch: refs/heads/master Commit: 39bd1fe48b1771d092914048a7a1b9e2686a14e5 Parents: f31f32b Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Tue Aug 29 12:25:37 2017 +0100 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Tue Aug 29 12:25:37 2017 +0100 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/swagger/SwaggerUiResolver.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/39bd1fe4/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 fbca07a..60f7d20 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,13 +52,14 @@ public class SwaggerUiResolver { 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; + } 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; + } } } } catch (Throwable ex) {
