------------------------------------------------------------
revno: 15563
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Thu 2014-06-05 19:37:56 +0200
message:
minor fix to contextService
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/DefaultContextService.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-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/DefaultContextService.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/DefaultContextService.java 2014-06-05 11:11:33 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/DefaultContextService.java 2014-06-05 17:37:56 +0000
@@ -28,14 +28,13 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
*/
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
import java.util.Set;
/**
@@ -44,8 +43,6 @@
@Service
public class DefaultContextService implements ContextService
{
- private static final Splitter COMMA_SPLITTER = Splitter.on( "," );
-
@Override
public String getServletPath()
{
@@ -109,11 +106,7 @@
Set<String> parameter = Sets.newHashSet();
String[] parameterValues = getRequest().getParameterValues( name );
-
- for ( String value : parameterValues )
- {
- parameter.addAll( Lists.newArrayList( COMMA_SPLITTER.split( value ) ) );
- }
+ Collections.addAll( parameter, parameterValues );
return parameter;
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
