You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@shindig.apache.org by lr...@apache.org on 2009/02/11 22:30:54 UTC

svn commit: r743518 - /incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java

Author: lryan
Date: Wed Feb 11 21:30:54 2009
New Revision: 743518

URL: http://svn.apache.org/viewvc?rev=743518&view=rev
Log:
Fix JSON conversion to handle CharSequence which is exposed by the EL expression results.

Modified:
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java

Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java?rev=743518&r1=743517&r2=743518&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java Wed Feb 11 21:30:54 2009
@@ -25,6 +25,7 @@
 import com.google.common.collect.Maps;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
+
 import org.joda.time.DateTime;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -119,6 +120,7 @@
     } else if (val != null && val.getClass().isEnum()) {
       return val.toString();
     } else if (val instanceof String
+        || val instanceof CharSequence
         || val instanceof Boolean
         || val instanceof Integer
         || val instanceof Date