You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/08/30 13:03:54 UTC
cxf git commit: Temp reverting SwaggerUI fix again
Repository: cxf
Updated Branches:
refs/heads/master 253900af3 -> 8394accbc
Temp reverting SwaggerUI fix again
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8394accb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8394accb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8394accb
Branch: refs/heads/master
Commit: 8394accbc18f4f9aced4da0706f42245d773afec
Parents: 253900a
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Aug 30 14:03:37 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Aug 30 14:03: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/8394accb/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 0e5b90a..63043b18 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;
+ }
}
}