=== modified file 'dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/smslib/SimplisticHttpGetGateWay.java' --- dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/smslib/SimplisticHttpGetGateWay.java 2013-03-07 12:53:46 +0000 +++ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/smslib/SimplisticHttpGetGateWay.java 2013-03-07 18:26:42 +0000 @@ -32,6 +32,7 @@ import java.util.HashMap; import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.smslib.AGateway; import org.smslib.GatewayException; import org.smslib.OutboundMessage; @@ -118,8 +119,8 @@ Map requestParameters = new HashMap( parameters ); - requestParameters.put( MESSAGE, msg.getText() ); requestParameters.put( RECIPIENT, msg.getRecipient() ); + String sender = msg.getFrom(); if ( sender != null ) { @@ -128,13 +129,16 @@ } try { - ResponseEntity response = restTemplate.getForEntity( urlTemplate, String.class, requestParameters, "UTF-8" ); - if ( response.getStatusCode().series() != HttpStatus.Series.SUCCESSFUL ) + String requestURL = urlTemplate; + String urlEncodedMessage = URLEncoder.encode( msg.getText(), "UTF-8" ); + requestURL = StringUtils.replace( requestURL, "{" + MESSAGE + "}", urlEncodedMessage ); + + ResponseEntity response = restTemplate.getForEntity( requestURL, String.class, requestParameters ); + if ( response.getStatusCode().series() != HttpStatus.Series.SUCCESSFUL ) { Logger.getInstance().logWarn( "Couldn't send message, got response " + response, null, getGatewayId() ); return false; } - } catch ( RestClientException e ) {