=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java' --- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java 2013-03-04 12:07:19 +0000 +++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java 2013-03-05 09:09:02 +0000 @@ -559,7 +559,7 @@ OrganisationUnit organisationUnitUpdate = conversionService.convert( facility, OrganisationUnit.class ); OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitUpdate.getUid() ); - if ( request.getHeader( "ETag" ) != null ) + if ( request.getHeader( "If-Match" ) != null ) { Facility old_facility = conversionService.convert( organisationUnit, Facility.class ); List organisationUnitLevels = organisationUnitService.getOrganisationUnitLevels(); @@ -568,7 +568,7 @@ String ETag = generateETagHeaderValue( body.getBytes() ); - if ( !ETag.equals( request.getHeader( "ETag" ) ) ) + if ( !ETag.equals( request.getHeader( "If-Match" ) ) ) { return new ResponseEntity( MessageResponseUtils.jsonMessage( "ETag provided does not match current ETag of facility" ), headers, HttpStatus.PRECONDITION_FAILED );