=== modified file 'dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/SmsSender.java' --- dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/SmsSender.java 2013-06-10 12:06:31 +0000 +++ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/SmsSender.java 2013-06-10 12:26:49 +0000 @@ -93,6 +93,7 @@ public String sendMessage( String subject, String text, User sender, Set users, boolean forceSend ) { String message = null; + if ( transportService == null || SmsLibService.gatewayMap == null ) { message = "No gateway"; === modified file 'dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/DefaultParserManager.java' --- dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/DefaultParserManager.java 2013-06-10 11:42:40 +0000 +++ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/DefaultParserManager.java 2013-06-10 12:26:49 +0000 @@ -131,13 +131,6 @@ this.messageSender = messageSender; } - private PatientService patientService; - - public void setPatientService( PatientService patientService ) - { - this.patientService = patientService; - } - @Autowired private IncomingSmsService incomingSmsService; @@ -235,7 +228,7 @@ } if ( !foundCommand ) { - Collection patientList = patientService.getPatientsByPhone( sender, null, null ); + Collection patientList = new ArrayList(); //TODO FIX! //patientService.getPatientsByPhone( sender, null, null ); if ( patientList != null && patientList.size() > 0 ) { === modified file 'dhis-2/dhis-services/dhis-service-sms/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-sms/src/main/resources/META-INF/dhis/beans.xml 2013-06-10 11:42:40 +0000 +++ dhis-2/dhis-services/dhis-service-sms/src/main/resources/META-INF/dhis/beans.xml 2013-06-10 12:26:49 +0000 @@ -62,7 +62,6 @@ -