Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 3c37b64cb -> 46d5cebc9
fixed NPE Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c580a91e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c580a91e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c580a91e Branch: refs/heads/3.1.x-fixes Commit: c580a91ec90991409e49d78af5978f29a5471458 Parents: 3c37b64 Author: Dennis Kieselhorst <d...@apache.org> Authored: Tue Sep 5 21:32:27 2017 +0200 Committer: Dennis Kieselhorst <m...@dekies.de> Committed: Tue Sep 5 21:38:34 2017 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c580a91e/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java index 5340e23..4f8fad6 100644 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java +++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java @@ -331,7 +331,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature { if (theLicense == null && !licenseWasSet) { if (props != null) { theLicense = props.getProperty(LICENSE_PROPERTY); - if (theLicense.isEmpty()) { + if (theLicense != null && theLicense.isEmpty()) { theLicense = null; } } else {
