cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1205833 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Date Thu, 24 Nov 2011 13:58:29 GMT
Author: sergeyb
Date: Thu Nov 24 13:58:28 2011
New Revision: 1205833

URL: http://svn.apache.org/viewvc?rev=1205833&view=rev
Log:
Merged revisions 1205830 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1205830 | sergeyb | 2011-11-24 13:56:13 +0000 (Thu, 24 Nov 2011) | 1 line
  
  Minor update to WADLgenerator to take subresources into consideration when checking for
the same path operation
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 24 13:58:28 2011
@@ -1 +1 @@
-/cxf/trunk:1205786
+/cxf/trunk:1205786,1205830

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1205833&r1=1205832&r2=1205833&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Thu Nov 24 13:58:28 2011
@@ -413,7 +413,9 @@ public class WadlGenerator implements Re
 
     protected boolean compareOperations(OperationResourceInfo ori1, OperationResourceInfo
ori2) {
         if (ori1 == null || ori2 == null
-            || !ori1.getURITemplate().getValue().equals(ori2.getURITemplate().getValue()))
{
+            || !ori1.getURITemplate().getValue().equals(ori2.getURITemplate().getValue())
+            || ori1.getHttpMethod() != null && ori2.getHttpMethod() == null 
+            || ori2.getHttpMethod() != null && ori1.getHttpMethod() == null) {
             return false;
         }
         int ori1PathParams = 0;



Mime
View raw message