=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/CriteriaQueryEngine.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/CriteriaQueryEngine.java 2015-03-09 08:57:50 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/CriteriaQueryEngine.java 2015-03-10 12:19:24 +0000 @@ -196,12 +196,12 @@ } case IN: { - if ( !Collection.class.isInstance( parameters.get( 0 ) ) || ((Collection) parameters.get( 0 )).isEmpty() ) + if ( !Collection.class.isInstance( parameters.get( 0 ) ) || ((Collection) parameters.get( 0 )).isEmpty() ) { return null; } - return Restrictions.in( property.getFieldName(), (Collection) parameters.get( 0 ) ); + return Restrictions.in( property.getFieldName(), (Collection) parameters.get( 0 ) ); } } === 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 06:57:45 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/AbstractPropertyIntrospectorService.java 2015-03-10 12:19:24 +0000 @@ -129,7 +129,7 @@ LocalSessionFactoryBean sessionFactoryBean = getLocalSessionFactoryBean(); SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) sessionFactory; - Iterator collectionIterator = sessionFactoryBean.getConfiguration().getCollectionMappings(); + Iterator collectionIterator = sessionFactoryBean.getConfiguration().getCollectionMappings(); while ( collectionIterator.hasNext() ) { @@ -182,7 +182,6 @@ return (LocalSessionFactoryBean) context.getBean( "&sessionFactory" ); } - @SuppressWarnings( "unused" ) protected Map getPropertiesFromHibernate( Class klass ) { updateJoinTables();