cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: [CXF-5904] Fixing the regression leading to eliminating all but one inherited parameters
Date Fri, 25 Jul 2014 09:05:34 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 6d793a6a0 -> f2969eca8


[CXF-5904] Fixing the regression leading to eliminating all but one inherited parameters


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

Branch: refs/heads/2.7.x-fixes
Commit: f2969eca8dce7b50b5cfe07e556f2aaa53411066
Parents: 6d793a6
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Fri Jul 25 12:01:26 2014 +0300
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Fri Jul 25 12:05:03 2014 +0300

----------------------------------------------------------------------
 .../java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f2969eca/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index 22e11cd..8045810 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -822,7 +822,7 @@ public class SourceGenerator {
         for (Element inherited : inheritedParams) {
             boolean duplicate = false;
             for (Element in : inParamElements) {
-                if (in.getLocalName().equals(inherited.getLocalName())) {    
+                if (in.getAttribute("name").equals(inherited.getAttribute("name"))) {   

                     duplicate = true;
                     break;
                 }


Mime
View raw message