[JENKINS-14827] Misinterpretation of "[...]".

jenkinsci · Aug 16, 2012 · 71809a8 · 71809a8
1 parent f5cb012
commit 71809a8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 24 deletions.
diff --git a/src/main/jdk15/net/sf/json/JSONArray.java b/src/main/jdk15/net/sf/json/JSONArray.java
@@ -916,12 +916,7 @@ private static JSONArray _fromJSONTokener( JSONTokener tokener, JsonConfig jsonC
                tokener.back();
                Object v = tokener.nextValue( jsonConfig );
                if( !JSONUtils.isFunctionHeader( v ) ){
-                  if( v instanceof String && JSONUtils.mayBeJSON( (String) v ) ){
-                     jsonArray.addValue( JSONUtils.DOUBLE_QUOTE + v + JSONUtils.DOUBLE_QUOTE,
-                           jsonConfig );
-                  }else{
                      jsonArray.addValue( v, jsonConfig );
-                  }
                   fireElementAddedEvent( index, jsonArray.get( index++ ), jsonConfig );
                }else{
                   // read params if any
@@ -2255,15 +2250,7 @@ private Object _processValue( Object value, JsonConfig jsonConfig ) {
          return _fromJSONTokener( (JSONTokener) value, jsonConfig );
       }else if( JSONUtils.isString( value ) ){
          String str = String.valueOf( value );
-         if( JSONUtils.mayBeJSON( str ) ){
-            try{
-               return JSONSerializer.toJSON( str, jsonConfig );
-            }catch( JSONException jsone ){
-               return JSONUtils.stripQuotes( str );
-            }
-         }else{
             return str;
-         }
       }else if( JSONUtils.isNumber( value ) ){
          JSONUtils.testValidity( value );
          return JSONUtils.transformNumber( (Number) value );

diff --git a/src/main/jdk15/net/sf/json/JSONObject.java b/src/main/jdk15/net/sf/json/JSONObject.java
@@ -893,24 +893,13 @@ private static JSONObject _fromJSONTokener( JSONTokener tokener, JsonConfig json
                   continue;
                }
                if( jsonPropertyFilter == null || !jsonPropertyFilter.apply( tokener, key, v ) ){
-                  if( v instanceof String && JSONUtils.mayBeJSON( (String) v ) ){
-                     value = JSONUtils.DOUBLE_QUOTE + v + JSONUtils.DOUBLE_QUOTE;
-                     if( jsonObject.properties.containsKey( key ) ){
-                        jsonObject.accumulate( key, value, jsonConfig );
-                        firePropertySetEvent( key, value, true, jsonConfig );
-                     }else{
-                        jsonObject.element( key, value, jsonConfig );
-                        firePropertySetEvent( key, value, false, jsonConfig );
-                     }
-                  }else{
                      if( jsonObject.properties.containsKey( key ) ){
                         jsonObject.accumulate( key, v, jsonConfig );
                         firePropertySetEvent( key, v, true, jsonConfig );
                      }else{
                         jsonObject.element( key, v, jsonConfig );
                         firePropertySetEvent( key, v, false, jsonConfig );
                      }
-                  }
                }
             }else{
                // read params if any

diff --git a/src/test/java/net/sf/json/TestJSONArray.java b/src/test/java/net/sf/json/TestJSONArray.java
@@ -1421,4 +1421,9 @@ private void testJSONArray( Object array, String expected ) {
          fail( jsone.getMessage() );
       }
    }
+
+    public void testMayBeJSON() {
+        assertEquals("[foo]", JSONArray.fromObject("[\"[foo]\"]").getString(0));
+    }
+
 }
diff --git a/src/test/java/net/sf/json/TestJSONObject.java b/src/test/java/net/sf/json/TestJSONObject.java
@@ -1434,4 +1434,9 @@ public void testCanonicalWrite() throws Exception {
         System.out.println(sw.toString());
         assertEquals(sw.toString(),"[true,1,5.3,{\"key1\":\"1\",\"key2\":\"2\",\"key3\":\"3\",\"string\":\"123\\u000d\\u000a\\u0008\\u0009\\u000c\\\\\\\\u65E5\\\\u672C\\\\u8A9E\"}]");
     }
+
+    public void testMayBeJSON() {
+        assertEquals("[foo]", JSONObject.fromObject("{x=\"[foo]\"}").getString("x"));
+    }
+
 }