cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6933] Correctly processing docs with the same target, patch from Mike Golod applied with thanks, This closes #141
Date Mon, 06 Jun 2016 20:51:40 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 776fb14cb -> f56ef0eaf


[CXF-6933] Correctly processing docs with the same target, patch from Mike Golod applied with
thanks, This closes #141


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

Branch: refs/heads/3.0.x-fixes
Commit: f56ef0eafda75ac872ab4e0951acb98b40334748
Parents: 776fb14
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Mon Jun 6 21:49:25 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Mon Jun 6 21:51:25 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f56ef0ea/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 1a04650..108acb6 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -1719,6 +1719,7 @@ public class WadlGenerator implements ContainerRequestFilter {
                               String category, 
                               boolean allowDefault,
                               boolean isJson) {
+        boolean found = false;
         for (Annotation a : anns) {
             if (a.annotationType() == Descriptions.class) {
                 Descriptions ds = (Descriptions)a;
@@ -1757,10 +1758,10 @@ public class WadlGenerator implements ContainerRequestFilter {
                     }
                 }
                 sb.append("</doc>");
-                return true;
+                found = true;
             }
         }
-        return false;
+        return found;
     }
 
     private String getNamespace() {


Mime
View raw message