Merge pull request #3986 from swagger-api/update-operation-1.5

gracekarina · web-flow · commit 655a454374a3 · 2021-07-02T08:37:12.000-05:00
Update Operation
diff --git a/modules/swagger-models/src/main/java/io/swagger/models/Operation.java b/modules/swagger-models/src/main/java/io/swagger/models/Operation.java
@@ -218,10 +218,12 @@ public Map<String, Response> getResponses() {
             responses = new Responses();
             responses.putAll(responsesObject);
         }
-        return responsesObject;
+        if (responsesObject != null) {
+            responses.putAll(responsesObject);
+        }
+        return responses;
     }
 
-
     public Responses getResponsesObject() {
         if (responsesObject == null && responses != null) {
             responsesObject = new Responses();

Original file line number	Diff line number	Diff line change
`@@ -218,10 +218,12 @@ public Map<String, Response> getResponses() {`
`218`	`218`	`responses = new Responses();`
`219`	`219`	`responses.putAll(responsesObject);`
`220`	`220`	`}`
`221`		`- return responsesObject;`
	`221`	`+ if (responsesObject != null) {`
	`222`	`+ responses.putAll(responsesObject);`
	`223`	`+ }`
	`224`	`+ return responses;`
`222`	`225`	`}`
`223`	`226`
`224`		`-`
`225`	`227`	`public Responses getResponsesObject() {`
`226`	`228`	`if (responsesObject == null && responses != null) {`
`227`	`229`	`responsesObject = new Responses();`