=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMetaDataDependencyService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMetaDataDependencyService.java	2015-02-09 09:23:51 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMetaDataDependencyService.java	2015-02-14 12:29:29 +0000
@@ -149,9 +149,11 @@
 
         Set<IdentifiableObject> dependencySet = getDependencySet( identifiableObjects );
 
+        List<Schema> schemas = schemaService.getMetadataSchemas();
+        
         for ( IdentifiableObject dependency : dependencySet )
         {
-            for ( Schema schema : schemaService.getMetadataSchemas() )
+            for ( Schema schema : schemas )
             {
                 if ( schema.getKlass().equals( dependency.getClass() ) )
                 {