=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java	2015-03-24 03:01:32 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java	2015-03-24 03:09:08 +0000
@@ -195,7 +195,7 @@
 
     private void updateSelf( Schema schema )
     {
-        if ( schema.getPropertyMap().containsKey( "__self__" ) )
+        if ( schema.haveProperty( "__self__" ) )
         {
             Property property = schema.getProperty( "__self__" );
             schema.setName( property.getName() );