=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.java 2012-06-22 15:49:20 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.java 2012-06-22 16:25:04 +0000 @@ -111,7 +111,9 @@ @PreAuthorize( "hasRole('ALL') or hasRole('F_METADATA_EXPORT')" ) public void exportZipped( @RequestParam Map parameters, HttpServletResponse response, HttpServletRequest request ) throws IOException { - if ( request.getHeader( "Accept" ).equalsIgnoreCase( "application/json" ) ) + String accept = request.getHeader( "Accept" ); + + if ( accept != null && accept.equalsIgnoreCase( "application/json" ) ) { exportZippedJSON( parameters, response ); } @@ -157,7 +159,9 @@ @PreAuthorize( "hasRole('ALL') or hasRole('F_METADATA_EXPORT')" ) public void exportGZipped( @RequestParam Map parameters, HttpServletResponse response, HttpServletRequest request ) throws IOException { - if ( request.getHeader( "Accept" ).equalsIgnoreCase( "application/json" ) ) + String accept = request.getHeader( "Accept" ); + + if ( accept != null && accept.equalsIgnoreCase( "application/json" ) ) { exportGZippedJSON( parameters, response ); }