summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-09-17 07:38:14 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-09-17 07:38:14 +0000
commit4c25a9edfead1e6550097507bf7f589b75b3d78f (patch)
treeaf6d955e562c0bf889f3189e3bdae7beed48c915 /sca-java-2.x/trunk/modules
parent25ef0f8ea58c8a7b7d8d1c5e974b68167e0a0397 (diff)
Fixing databinding issue when submitting empty strings from js client to a json-rpc service
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@998006 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules')
-rw-r--r--sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
index 3620fc117f..ca28ec5833 100644
--- a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
+++ b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
@@ -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 PullTransformer<Object, Object> {
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) {