root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SPR-5975 - BufferedImageHttpMessageConverter doesn't work on Google AppEngine 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1680 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Arjen Poutsma 2009-08-04 08:07:24 +00:00
parent be0f800e8a
commit ab9eea6584
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
View File

@ -166,8 +166,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen
private HttpMessageConverter<?>[] messageConverters =
new HttpMessageConverter[]{new ByteArrayHttpMessageConverter(), new StringHttpMessageConverter(),
new FormHttpMessageConverter(), new SourceHttpMessageConverter(),
new BufferedImageHttpMessageConverter()};
new FormHttpMessageConverter(), new SourceHttpMessageConverter()};
public AnnotationMethodHandlerAdapter() {
// no restriction of HTTP methods by default

2
org.springframework.web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
View File

@ -116,7 +116,7 @@ public class BufferedImageHttpMessageConverter extends AbstractHttpMessageConver
/** Sets the cache directory. If this property is set to an existing directory, this converter will cache image data. */
public void setCacheDir(File cacheDir) {
Assert.notNull(cacheDir, "'cacheDir' must not be null");
Assert.isTrue(cacheDir.isDirectory(), "'cacheDir' is not a valid directory");
Assert.isTrue(cacheDir.isDirectory(), "'cacheDir' is not a directory");
this.cacheDir = cacheDir;
}

3
org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java
View File

@ -94,8 +94,7 @@ public class RestTemplate extends HttpAccessor implements RestOperations {
private HttpMessageConverter<?>[] messageConverters =
new HttpMessageConverter[]{new ByteArrayHttpMessageConverter(), new StringHttpMessageConverter(),
new FormHttpMessageConverter(), new SourceHttpMessageConverter(),
new BufferedImageHttpMessageConverter()};
new FormHttpMessageConverter(), new SourceHttpMessageConverter()};
private ResponseErrorHandler errorHandler = new DefaultResponseErrorHandler();