Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 247A310230 for ; Thu, 27 Jun 2013 19:29:23 +0000 (UTC) Received: (qmail 10190 invoked by uid 500); 27 Jun 2013 19:29:23 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 10120 invoked by uid 500); 27 Jun 2013 19:29:22 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 10113 invoked by uid 99); 27 Jun 2013 19:29:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jun 2013 19:29:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jun 2013 19:29:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 401EE2388A6C; Thu, 27 Jun 2013 19:29:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1497518 - in /sling/trunk/bundles/commons/json/src: main/java/org/apache/sling/commons/json/JSONObject.java test/java/org/apache/sling/commons/json/JSONObjectTest.java Date: Thu, 27 Jun 2013 19:29:00 -0000 To: commits@sling.apache.org From: justin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130627192900.401EE2388A6C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: justin Date: Thu Jun 27 19:28:59 2013 New Revision: 1497518 URL: http://svn.apache.org/r1497518 Log: SLING-2937 - using Long.valueOf() in getLong() to ensure correct parsing Modified: sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/JSONObject.java sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/JSONObjectTest.java Modified: sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/JSONObject.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/JSONObject.java?rev=1497518&r1=1497517&r2=1497518&view=diff ============================================================================== --- sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/JSONObject.java (original) +++ sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/JSONObject.java Thu Jun 27 19:28:59 2013 @@ -484,7 +484,8 @@ public class JSONObject { public long getLong(String key) throws JSONException { Object o = get(key); return o instanceof Number ? - ((Number)o).longValue() : (long)getDouble(key); + ((Number)o).longValue() : + Long.valueOf((String)o).longValue(); } Modified: sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/JSONObjectTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/JSONObjectTest.java?rev=1497518&r1=1497517&r2=1497518&view=diff ============================================================================== --- sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/JSONObjectTest.java (original) +++ sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/JSONObjectTest.java Thu Jun 27 19:28:59 2013 @@ -57,4 +57,10 @@ public class JSONObjectTest extends Test TestCase.assertTrue(obj.get(KEY).equals(null)); TestCase.assertEquals("{\"" + KEY + "\":null}", obj.toString()); } + + public void testParseLong() throws JSONException { + String jsonStr = "{\"longvalue\":\"13857270119014401\"}"; + JSONObject obj = new JSONObject(jsonStr); + TestCase.assertEquals(13857270119014401L, obj.getLong("longvalue")); + } }