Repository: cxf Updated Branches: refs/heads/master 70b3bdd83 -> 8fb21e240
[CXF-7258] Trying the default SwaggerUIResolver if the OSGI one returns null Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8fb21e24 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8fb21e24 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8fb21e24 Branch: refs/heads/master Commit: 8fb21e240890412c10b4e1b99e64e3d68c7d3d87 Parents: 70b3bdd Author: Sergey Beryozkin <[email protected]> Authored: Tue Feb 21 12:58:11 2017 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Feb 21 12:58:11 2017 +0000 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/8fb21e24/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 61d1fb0..f38ad2b 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 @@ -69,6 +69,10 @@ public class SwaggerUiResolver { } public static String findSwaggerUiRoot(String swaggerUiVersion) { - return HELPER.findSwaggerUiRootInternal(swaggerUiVersion); + String root = HELPER.findSwaggerUiRootInternal(swaggerUiVersion); + if (root == null && HELPER.getClass() != SwaggerUiResolver.class) { + root = new SwaggerUiResolver().findSwaggerUiRootInternal(swaggerUiVersion); + } + return root; } }
