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 72877DD0F for ; Tue, 20 Nov 2012 05:43:52 +0000 (UTC) Received: (qmail 46243 invoked by uid 500); 20 Nov 2012 05:43:50 -0000 Delivered-To: apmail-chemistry-commits-archive@chemistry.apache.org Received: (qmail 46080 invoked by uid 500); 20 Nov 2012 05:43:45 -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 46008 invoked by uid 99); 20 Nov 2012 05:43:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2012 05:43:42 +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; Tue, 20 Nov 2012 05:43:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 95EF323888E7; Tue, 20 Nov 2012 05:43:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1411548 - /chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/DocumentVersionImpl.java Date: Tue, 20 Nov 2012 05:43:21 -0000 To: commits@chemistry.apache.org From: jens@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121120054321.95EF323888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jens Date: Tue Nov 20 05:43:20 2012 New Revision: 1411548 URL: http://svn.apache.org/viewvc?rev=1411548&view=rev Log: InMemeory: fix a bug when checking out a version with updated properties Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/DocumentVersionImpl.java Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/DocumentVersionImpl.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/DocumentVersionImpl.java?rev=1411548&r1=1411547&r2=1411548&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/DocumentVersionImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/DocumentVersionImpl.java Tue Nov 20 05:43:20 2012 @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.apache.chemistry.opencmis.commons.PropertyIds; import org.apache.chemistry.opencmis.commons.data.ContentStream; @@ -61,9 +62,16 @@ public class DocumentVersionImpl extends setContent(content, false); fIsMajor = verState == VersioningState.MAJOR || verState == null; fIsPwc = verState == VersioningState.CHECKEDOUT; - fProperties = new HashMap>(); // ensure that we + fProperties = new HashMap>(); + // copy user properties from latest version + DocumentVersionImpl src = (DocumentVersionImpl)container.getLatestVersion(false); + if (null != src && null != src.fProperties) { + for (Entry> prop : src.fProperties.entrySet()) { + fProperties.put(prop.getKey(), prop.getValue()); + } + } + label = createVersionLabel(); - // have a map } public void setContent(ContentStream content, boolean mustPersist) {