From 96012a97beb083342c5387aec81b0e5889c29b55 Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Wed, 8 Aug 2012 09:07:05 +0100
Subject: [PATCH] ensure json deserialization works for array based items when
 create a new application user.

---
 .../api/infrastructure/ApiDataConversionServiceImpl.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java
index 19f0ff721..e166ab0fb 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java
@@ -748,8 +748,8 @@ public class ApiDataConversionServiceImpl implements ApiDataConversionService {
 			throw new InvalidJsonException();
 		}
 		
-		Type typeOfMap = new TypeToken<Map<String, String>>(){}.getType();
-	    Map<String, String> requestMap = gsonConverter.fromJson(json, typeOfMap);
+		Type typeOfMap = new TypeToken<Map<String, Object>>(){}.getType();
+	    Map<String, Object> requestMap = gsonConverter.fromJson(json, typeOfMap);
 	    
 	    Set<String> supportedParams = new HashSet<String>(
 	    		Arrays.asList("username", "firstname", "lastname", "password", "repeatPassword", "email", "officeId", "notSelectedRoles", "roles")
@@ -1161,10 +1161,10 @@ public class ApiDataConversionServiceImpl implements ApiDataConversionService {
 		return paramValue;
 	}
 	
-	private Long extractLongParameter(final String paramName, final Map<String, String> requestMap, final Set<String> modifiedParameters) {
+	private Long extractLongParameter(final String paramName, final Map<String, ?> requestMap, final Set<String> modifiedParameters) {
 		Long paramValue = null;
 		if (requestMap.containsKey(paramName)) {
-			String valueAsString = requestMap.get(paramName);
+			String valueAsString = (String) requestMap.get(paramName);
 			if (StringUtils.isNotBlank(valueAsString)) {
 				paramValue = Long.valueOf(Double.valueOf(valueAsString).longValue());
 			}