=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/support/DataStreamSerializableMessageConverter.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/support/DataStreamSerializableMessageConverter.java 2011-11-29 12:06:35 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/support/DataStreamSerializableMessageConverter.java 2012-01-06 12:12:16 +0000
@@ -18,14 +18,24 @@
@Override
public boolean canRead( Class> clazz, MediaType mediaType )
{
- return MediaTypes.MEDIA_TYPES.contains( mediaType) && DataStreamSerializable.class.isAssignableFrom( clazz );
+ if (mediaType == null){
+ return DataStreamSerializable.class.isAssignableFrom( clazz );
+ }
+ else {
+ return MediaTypes.MEDIA_TYPES.contains( mediaType) && DataStreamSerializable.class.isAssignableFrom( clazz );
+ }
}
@Override
public boolean canWrite( Class> clazz, MediaType mediaType )
{
- return MediaTypes.MEDIA_TYPES.contains( mediaType) && DataStreamSerializable.class.isAssignableFrom( clazz );
+ if (mediaType == null){
+ return DataStreamSerializable.class.isAssignableFrom( clazz );
+ }
+ else {
+ return MediaTypes.MEDIA_TYPES.contains( mediaType) && DataStreamSerializable.class.isAssignableFrom( clazz );
+ }
}
@Override
=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml 2012-01-05 20:39:23 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml 2012-01-06 12:12:16 +0000
@@ -10,7 +10,11 @@
-
+
+
+
+
+