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 A9582102AE for ; Fri, 23 Aug 2013 14:45:52 +0000 (UTC) Received: (qmail 33306 invoked by uid 500); 23 Aug 2013 14:45:52 -0000 Delivered-To: apmail-chemistry-commits-archive@chemistry.apache.org Received: (qmail 33259 invoked by uid 500); 23 Aug 2013 14:45:51 -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 33241 invoked by uid 99); 23 Aug 2013 14:45:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Aug 2013 14:45:50 +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; Fri, 23 Aug 2013 14:45:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4637F2388906; Fri, 23 Aug 2013 14:45:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1516870 - /chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java Date: Fri, 23 Aug 2013 14:45:26 -0000 To: commits@chemistry.apache.org From: jens@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130823144526.4637F2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jens Date: Fri Aug 23 14:45:25 2013 New Revision: 1516870 URL: http://svn.apache.org/r1516870 Log: InMemory: remove calling clone() method Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.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/storedobj/impl/StoreManagerImpl.java?rev=1516870&r1=1516869&r2=1516870&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java Fri Aug 23 14:45:25 2013 @@ -33,6 +33,7 @@ import java.util.Set; import org.apache.chemistry.opencmis.commons.data.ObjectList; import org.apache.chemistry.opencmis.commons.data.PermissionMapping; import org.apache.chemistry.opencmis.commons.data.RepositoryInfo; +import org.apache.chemistry.opencmis.commons.definitions.MutableTypeDefinition; import org.apache.chemistry.opencmis.commons.definitions.PermissionDefinition; import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition; import org.apache.chemistry.opencmis.commons.definitions.TypeDefinitionContainer; @@ -259,11 +260,8 @@ public class StoreManagerImpl implements result = new ArrayList(rootTypes.size()); // copy list and omit properties for (TypeDefinitionContainer c : rootTypes) { - AbstractTypeDefinition td = ((AbstractTypeDefinition) c.getTypeDefinition()).clone(); + MutableTypeDefinition td = typeFactory.copy(c.getTypeDefinition(), includePropertyDefinitions); TypeDefinitionContainerImpl tdc = new TypeDefinitionContainerImpl(td); - td.setPropertyDefinitions(null); -// MutableTypeDefinition td = typeFactory.copy(c.getTypeDefinition(), includePropertyDefinitions); -// TypeDefinitionContainerImpl tdc = new TypeDefinitionContainerImpl(td); tdc.setChildren(c.getChildren()); result.add(tdc); } @@ -530,12 +528,8 @@ public class StoreManagerImpl implements public static TypeDefinitionContainer cloneTypeList(int depth, boolean includePropertyDefinitions, TypeDefinitionContainer tdc, TypeDefinitionContainer parent) { -// final TypeDefinitionFactory typeFactory = TypeDefinitionFactory.newInstance(); -// MutableTypeDefinition tdClone = typeFactory.copy(tdc.getTypeDefinition(), includePropertyDefinitions); - AbstractTypeDefinition tdClone = ((AbstractTypeDefinition) tdc.getTypeDefinition()).clone(); - if (!includePropertyDefinitions) { - tdClone.setPropertyDefinitions(null); - } + final TypeDefinitionFactory typeFactory = TypeDefinitionFactory.newInstance(); + MutableTypeDefinition tdClone = typeFactory.copy(tdc.getTypeDefinition(), includePropertyDefinitions); TypeDefinitionContainerImpl tdcClone = new TypeDefinitionContainerImpl(tdClone); if (null != parent) {