dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18499
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-03-06 12:37:29 +0700
message:
  minor fix
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/AbstractPropertyIntrospectorService.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/AbstractPropertyIntrospectorService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/AbstractPropertyIntrospectorService.java	2015-03-06 05:27:08 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/AbstractPropertyIntrospectorService.java	2015-03-06 05:37:29 +0000
@@ -129,14 +129,14 @@
 
         LocalSessionFactoryBean sessionFactoryBean = getLocalSessionFactoryBean();
         SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) sessionFactory;
-        Iterator iterator = sessionFactoryBean.getConfiguration().getCollectionMappings();
+        Iterator collectionIterator = sessionFactoryBean.getConfiguration().getCollectionMappings();
 
-        while ( iterator.hasNext() )
+        while ( collectionIterator.hasNext() )
         {
-            Collection collection = (Collection) iterator.next();
-            CollectionPersister persister = sessionFactoryImplementor.getCollectionPersister( collection.getRole() );
+            Collection collection = (Collection) collectionIterator.next();
+            CollectionPersister collectionPersister = sessionFactoryImplementor.getCollectionPersister( collection.getRole() );
 
-            if ( persister.isManyToMany() && collection.getType().isAssociationType() )
+            if ( collectionPersister.isManyToMany() && collection.getType().isAssociationType() )
             {
                 AssociationType associationType = (AssociationType) collection.getType();
                 Joinable associatedJoinable = associationType.getAssociatedJoinable( sessionFactoryImplementor );
@@ -224,10 +224,10 @@
 
                 CollectionType collectionType = (CollectionType) type;
                 Collection collection = sessionFactoryBean.getConfiguration().getCollectionMapping( collectionType.getRole() );
-                CollectionPersister persister = sessionFactoryImplementor.getCollectionPersister( collection.getRole() );
+                CollectionPersister collectionPersister = sessionFactoryImplementor.getCollectionPersister( collection.getRole() );
 
                 property.setOwner( !collection.isInverse() );
-                property.setManyToMany( persister.isManyToMany() );
+                property.setManyToMany( collectionPersister.isManyToMany() );
 
                 if ( property.isOwner() )
                 {