Re: cxf git commit: fixed NPE

[Dennis Kieselhorst]

> Thanks Dennis, you were right when you were talking about simplifying >
> the code and having the default licenses removed :-)>

Hehe never mind, I should have reviewed the code instead of just testing
the functionality... :-)

Regards
Dennis

Re: cxf git commit: fixed NPE

[Sergey Beryozkin]

Thanks Dennis, you were right when you were talking about simplifying 
the code and having the default licenses removed :-)


Cheers, Sergey
On 05/09/17 20:32, d...@apache.org wrote:

Repository: cxf
Updated Branches:
   refs/heads/master 70ac8edcc -> 3453c6cca


fixed NPE


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3453c6cc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3453c6cc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3453c6cc

Branch: refs/heads/master
Commit: 3453c6ccac9bb829af8ecc65823e66b68db3e831
Parents: 70ac8ed
Author: Dennis Kieselhorst 
Authored: Tue Sep 5 21:32:27 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Tue Sep 5 21:32:27 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/3453c6cc/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 33ee47c..4679e6e 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
@@ -305,7 +305,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 {