Return-Path: Delivered-To: apmail-incubator-chemistry-commits-archive@minotaur.apache.org Received: (qmail 31394 invoked from network); 9 Mar 2010 13:26:46 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Mar 2010 13:26:46 -0000 Received: (qmail 28915 invoked by uid 500); 9 Mar 2010 13:26:18 -0000 Delivered-To: apmail-incubator-chemistry-commits-archive@incubator.apache.org Received: (qmail 28870 invoked by uid 500); 9 Mar 2010 13:26:18 -0000 Mailing-List: contact chemistry-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chemistry-dev@incubator.apache.org Delivered-To: mailing list chemistry-commits@incubator.apache.org Received: (qmail 28781 invoked by uid 99); 9 Mar 2010 13:26:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Mar 2010 13:26:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 09 Mar 2010 13:26:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2E348238897F; Tue, 9 Mar 2010 13:25:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r920861 - /incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/main/java/org/apache/opencmis/client/runtime/PersistentFolderImpl.java Date: Tue, 09 Mar 2010 13:25:55 -0000 To: chemistry-commits@incubator.apache.org From: dcaruana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100309132555.2E348238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dcaruana Date: Tue Mar 9 13:25:54 2010 New Revision: 920861 URL: http://svn.apache.org/viewvc?rev=920861&view=rev Log: Fix NPE when retrieving empty list of folder children via OpenCMIS folder.getChildren() Modified: incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/main/java/org/apache/opencmis/client/runtime/PersistentFolderImpl.java Modified: incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/main/java/org/apache/opencmis/client/runtime/PersistentFolderImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/main/java/org/apache/opencmis/client/runtime/PersistentFolderImpl.java?rev=920861&r1=920860&r2=920861&view=diff ============================================================================== --- incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/main/java/org/apache/opencmis/client/runtime/PersistentFolderImpl.java (original) +++ incubator/chemistry/trunk/opencmis/opencmis-client/opencmis-client-impl/src/main/java/org/apache/opencmis/client/runtime/PersistentFolderImpl.java Tue Mar 9 13:25:54 2010 @@ -240,9 +240,12 @@ public class PersistentFolderImpl extend // convert objects List page = new ArrayList(); - for (ObjectInFolderData objectData : children.getObjects()) { - if (objectData.getObject() != null) { - page.add(objectFactory.convertObject(objectData.getObject(), ctxt)); + List childObjects = children.getObjects(); + if (childObjects != null) { + for (ObjectInFolderData objectData : childObjects) { + if (objectData.getObject() != null) { + page.add(objectFactory.convertObject(objectData.getObject(), ctxt)); + } } }