You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/03/21 17:01:26 UTC
[5/7] camel git commit: CAMEL-9732: camel-swagger-java - Issue in
appendModels in the reader
CAMEL-9732: camel-swagger-java - Issue in appendModels in the reader
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a923fa6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a923fa6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a923fa6
Branch: refs/heads/master
Commit: 4a923fa62e73de7e9b192ace271d4a8a3ea00000
Parents: c32bd08
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Mar 21 17:00:20 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 21 17:00:20 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/swagger/RestSwaggerReader.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4a923fa6/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index dc7bfeb..5bcbcfe 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -510,7 +510,10 @@ public class RestSwaggerReader {
// favor keeping any existing model that has the vendor extension in the model
boolean oldExt = false;
if (swagger.getDefinitions() != null && swagger.getDefinitions().get(entry.getKey()) != null) {
- oldExt = swagger.getDefinitions().get(entry.getKey()).getVendorExtensions().get("x-className") == null;
+ Model oldModel = swagger.getDefinitions().get(entry.getKey());
+ if (oldModel.getVendorExtensions() != null) {
+ oldExt = oldModel.getVendorExtensions().get("x-className") == null;
+ }
}
if (!oldExt) {