svn commit: r1296003 - /tuscany/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java

[rfeng]

Author: rfeng
Date: Fri Mar  2 00:00:18 2012
New Revision: 1296003

URL: http://svn.apache.org/viewvc?rev=1296003&view=rev
Log:
Reuse the ObjectMapper

Modified:
    
tuscany/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java?rev=1296003&r1=1296002&r2=1296003&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
 Fri Mar  2 00:00:18 2012
@@ -100,6 +100,9 @@ public class JacksonHelper {
                 }
             }
         }
+        if ( cls != null && mapper == null ) {
+            return MAPPER;
+        }
         if (mapper == null) {
             mapper = new ObjectMapper();
             mapper.registerModule(new JsonOrgModule());