svn commit: r1205830 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java

[sergeyb]

Author: sergeyb
Date: Thu Nov 24 13:56:13 2011
New Revision: 1205830

URL: http://svn.apache.org/viewvc?rev=1205830&view=rev
Log:
Minor update to WADLgenerator to take subresources into consideration when 
checking for the same path operation

Modified:
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java

Modified: 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1205830&r1=1205829&r2=1205830&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 Thu Nov 24 13:56:13 2011
@@ -436,7 +436,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;