Return-Path: X-Original-To: apmail-chemistry-commits-archive@www.apache.org Delivered-To: apmail-chemistry-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 1C36AEA48 for ; Mon, 18 Mar 2013 09:58:14 +0000 (UTC) Received: (qmail 21760 invoked by uid 500); 18 Mar 2013 09:58:13 -0000 Delivered-To: apmail-chemistry-commits-archive@chemistry.apache.org Received: (qmail 21670 invoked by uid 500); 18 Mar 2013 09:58:11 -0000 Mailing-List: contact commits-help@chemistry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@chemistry.apache.org Delivered-To: mailing list commits@chemistry.apache.org Received: (qmail 21622 invoked by uid 99); 18 Mar 2013 09:58:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 09:58:09 +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; Mon, 18 Mar 2013 09:58:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B820F23888CD; Mon, 18 Mar 2013 09:57:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1457690 - /chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java Date: Mon, 18 Mar 2013 09:57:48 -0000 To: commits@chemistry.apache.org From: jens@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130318095748.B820F23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jens Date: Mon Mar 18 09:57:48 2013 New Revision: 1457690 URL: http://svn.apache.org/r1457690 Log: InMemory: fix NPE when creating types without properties Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java?rev=1457690&r1=1457689&r2=1457690&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java Mon Mar 18 09:57:48 2013 @@ -155,14 +155,16 @@ public class TypeValidator { td.setTypeMutability(tm); td.setExtensions(td.getExtensions()); - Map> propDefsNew = new HashMap>(); - Map> propDefs = td.getPropertyDefinitions(); - for (PropertyDefinition pd : propDefs.values()) { - AbstractPropertyDefinition pdNew = completePropertyDef(pd); - adjustPropertyNamesAndId(pdNew); - propDefsNew.put(pdNew.getId(), pd); + if (null != td.getPropertyDefinitions()) { + Map> propDefsNew = new HashMap>(); + Map> propDefs = td.getPropertyDefinitions(); + for (PropertyDefinition pd : propDefs.values()) { + AbstractPropertyDefinition pdNew = completePropertyDef(pd); + adjustPropertyNamesAndId(pdNew); + propDefsNew.put(pdNew.getId(), pd); + } + td.setPropertyDefinitions(propDefsNew); } - td.setPropertyDefinitions(propDefsNew); } private static void checkProperties(TypeManager tm, Collection> pds) {