You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/06/06 20:49:41 UTC
cxf git commit: [CXF-6933] Correctly processing docs with the same
target, patch from Mike Golod applied with thanks, This closes #141
Repository: cxf
Updated Branches:
refs/heads/master 540033d24 -> cd57c465d
[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/cd57c465
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cd57c465
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cd57c465
Branch: refs/heads/master
Commit: cd57c465dd081c60e799e414871533400e8f466c
Parents: 540033d
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Jun 6 21:49:25 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Jun 6 21:49: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/cd57c465/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 14d323b..17b745f 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
@@ -1743,6 +1743,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;
@@ -1781,10 +1782,10 @@ public class WadlGenerator implements ContainerRequestFilter {
}
}
sb.append("</doc>");
- return true;
+ found = true;
}
}
- return false;
+ return found;
}
private String getNamespace() {