Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@tuscany.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1003856 -
 /tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
Date: Sat, 02 Oct 2010 18:47:54 -0000
To: commits@tuscany.apache.org
From: lresende@apache.org
Message-Id: <20101002184754.6759D23889B9@eris.apache.org>

Author: lresende
Date: Sat Oct  2 18:47:54 2010
New Revision: 1003856

URL: http://svn.apache.org/viewvc?rev=1003856&view=rev
Log:
Fixing databinding issue when submitting empty strings from js client to a json-rpc service

Modified:
    tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java

Modified: tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java?rev=1003856&r1=1003855&r2=1003856&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java (original)
+++ tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java Sat Oct  2 18:47:54 2010
@@ -6,15 +6,15 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.databinding.json.jackson;
@@ -49,7 +49,12 @@ public class JSON2Object implements Pull
         try {
             JavaType javaType = TypeFactory.type(context.getTargetDataType().getGenericType());
             if (source instanceof String) {
-                return mapper.readValue((String)source, javaType);
+            	String sourceString = (String) source;
+            	if(sourceString.isEmpty()) {
+            		return sourceString;
+            	} else {
+            		return mapper.readValue((String)source, javaType);
+            	}
             } else if (source instanceof JsonNode) {
                 return mapper.treeToValue((JsonNode)source, context.getTargetDataType().getPhysical());
             } else if (source instanceof JsonParser) {