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 2009/06/18 11:20:30 UTC
svn commit: r785977 - in /cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src:
main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
Author: sergeyb
Date: Thu Jun 18 09:20:29 2009
New Revision: 785977
URL: http://svn.apache.org/viewvc?rev=785977&view=rev
Log:
Adding the code lost during my messy backmerge from the trunk
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
Modified: cxf/branches/2.2.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.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=785977&r1=785976&r2=785977&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java Thu Jun 18 09:20:29 2009
@@ -49,6 +49,10 @@
public Response handleRequest(Message m, ClassResourceInfo resource) {
+ if (!"GET".equals(m.get(Message.HTTP_REQUEST_METHOD))) {
+ return null;
+ }
+
UriInfo ui = new UriInfoImpl(m);
if (!ui.getQueryParameters().containsKey(WADL_QUERY)) {
return null;
Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java?rev=785977&r1=785976&r2=785977&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java Thu Jun 18 09:20:29 2009
@@ -87,6 +87,7 @@
EasyMock.expectLastCall().andReturn(epr).anyTimes();
m.put(Message.REQUEST_URI, pathInfo);
m.put(Message.QUERY_STRING, query);
+ m.put(Message.HTTP_REQUEST_METHOD, "GET");
control.replay();
return m;
}