You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by mi...@apache.org on 2010/02/16 11:02:33 UTC
svn commit: r910450 - in
/incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs: ./
org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/
Author: mir
Date: Tue Feb 16 10:02:32 2010
New Revision: 910450
URL: http://svn.apache.org/viewvc?rev=910450&view=rev
Log:
CLEREZZA-109: applied Agron's patch. Media type will now be set to application/octet-stream, if request has no Content-Type header
Added:
incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs/
- copied from r910446, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/
Modified:
incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/RootResourceExecutorImpl.java
incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/WebRequestImpl.java
Modified: incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/RootResourceExecutorImpl.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/RootResourceExecutorImpl.java?rev=910450&r1=910446&r2=910450&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/RootResourceExecutorImpl.java (original)
+++ incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/RootResourceExecutorImpl.java Tue Feb 16 10:02:32 2010
@@ -333,14 +333,18 @@
* @return
*/
private Set<MethodAndInputType> filterByConsumedType(Set<Method> methods,
- WebRequest request) {
+ WebRequest request) throws HandlerException {
final String contentTypeString = request.getHeaders().getFirst(
HttpHeaders.CONTENT_TYPE);
MediaType mediaType;
if (contentTypeString != null) {
mediaType = MediaType.valueOf(contentTypeString);
} else {
- mediaType = null;
+ if (request.getWrhapiRequest().getMessageBody() != null) {
+ mediaType = MediaType.APPLICATION_OCTET_STREAM_TYPE;
+ } else {
+ mediaType = null;
+ }
}
Set<MethodAndInputType> result = new HashSet<MethodAndInputType>();
METHODS: for (Method method : methods) {
Modified: incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/WebRequestImpl.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/WebRequestImpl.java?rev=910450&r1=910446&r2=910450&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/WebRequestImpl.java (original)
+++ incubator/clerezza/issues/CLEREZZA-109/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/WebRequestImpl.java Tue Feb 16 10:02:32 2010
@@ -173,8 +173,7 @@
MediaType mediaType;
if ((contentTypeHeaders == null)
|| (contentTypeHeaders.length == 0)) {
- mediaType = new MediaType("application",
- "x-www-form-urlencoded");// MediaType.WILDCARD_TYPE;
+ mediaType = MediaType.APPLICATION_OCTET_STREAM_TYPE;
} else {
mediaType = MediaType.valueOf(contentTypeHeaders[0]);
}