Return-Path: Delivered-To: apmail-incubator-chemistry-commits-archive@minotaur.apache.org Received: (qmail 81639 invoked from network); 22 Jun 2010 11:35:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Jun 2010 11:35:33 -0000 Received: (qmail 90273 invoked by uid 500); 22 Jun 2010 11:35:33 -0000 Delivered-To: apmail-incubator-chemistry-commits-archive@incubator.apache.org Received: (qmail 90226 invoked by uid 500); 22 Jun 2010 11:35:32 -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 90218 invoked by uid 99); 22 Jun 2010 11:35:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jun 2010 11:35:31 +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, 22 Jun 2010 11:35:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5FF4923888D2; Tue, 22 Jun 2010 11:34:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r956852 - /incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java Date: Tue, 22 Jun 2010 11:34:45 -0000 To: chemistry-commits@incubator.apache.org From: jens@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100622113445.5FF4923888D2@eris.apache.org> Author: jens Date: Tue Jun 22 11:34:45 2010 New Revision: 956852 URL: http://svn.apache.org/viewvc?rev=956852&view=rev Log: InMemory server: Fix bug that check-out generates in Atom entry information for wrong object. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java?rev=956852&r1=956851&r2=956852&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java Tue Jun 22 11:34:45 2010 @@ -102,7 +102,7 @@ public class InMemoryVersioningServiceIm return od; } - public ObjectData checkOut(CallContext context, String repositoryId, Holder objectId, + public void checkOut(CallContext context, String repositoryId, Holder objectId, ExtensionsData extension, Holder contentCopied, ObjectInfoHandler objectInfos) { StoredObject so = checkStandardParameters(repositoryId, objectId.getValue()); @@ -138,15 +138,13 @@ public class InMemoryVersioningServiceIm // additional information: if (context.isObjectInfoRequired()) { ObjectInfoImpl objectInfo = new ObjectInfoImpl(); - fAtomLinkProvider.fillInformationForAtomLinks(repositoryId, so, objectInfo); + fAtomLinkProvider.fillInformationForAtomLinks(repositoryId, pwc, objectInfo); objectInfos.addObjectInfo(objectInfo); } TypeDefinition td = fStoreManager.getTypeById(repositoryId, so.getTypeId()).getTypeDefinition(); ObjectData od = PropertyCreationHelper.getObjectData(td, so, null, user, false, IncludeRelationships.NONE, null, false, false, extension); - - return od; } public List getAllVersions(CallContext context, String repositoryId, String versionSeriesId,