=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java 2014-10-14 03:55:34 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java 2014-10-27 15:13:17 +0000 @@ -138,7 +138,7 @@ } else if ( options.hasPaging() ) { - int count = manager.getCount( getEntityClass() ); + int count = messageService.getMessageConversationCount(); Pager pager = new Pager( options.getPage(), count, options.getPageSize() ); metaData.setPager( pager ); @@ -371,7 +371,6 @@ return responseNode; } - //-------------------------------------------------------------------------- // Delete a MessageConversation (requires override auth) //--------------------------------------------------------------------------