Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-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 84006C626 for ; Mon, 3 Jun 2013 11:49:18 +0000 (UTC) Received: (qmail 8185 invoked by uid 500); 3 Jun 2013 11:49:18 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 8155 invoked by uid 500); 3 Jun 2013 11:49:17 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 8148 invoked by uid 99); 3 Jun 2013 11:49:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jun 2013 11:49:17 +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, 03 Jun 2013 11:49:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8BD112388847; Mon, 3 Jun 2013 11:48:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1488964 - /archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Date: Mon, 03 Jun 2013 11:48:54 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130603114854.8BD112388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Mon Jun 3 11:48:54 2013 New Revision: 1488964 URL: http://svn.apache.org/r1488964 Log: fix getProjectVersion Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1488964&r1=1488963&r2=1488964&view=diff ============================================================================== --- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java (original) +++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Mon Jun 3 11:48:54 2013 @@ -770,6 +770,22 @@ public class CassandraMetadataRepository throw new MetadataRepositoryException( e.getMessage(), e ); } + key = new ProjectVersionMetadataModel.KeyBuilder().withRepository( repositoryId ).withNamespace( + namespace ).withProjectId( projectId ).withId( projectVersion ).build(); + + ProjectVersionMetadataModel projectVersionMetadataModel = projectVersionMetadataModelEntityManager.get( key ); + + if ( projectVersionMetadataModel == null ) + { + projectVersionMetadataModel = new ProjectVersionMetadataModel(); + projectVersionMetadataModel.setRowId( key ); + projectVersionMetadataModel.setProjectId( projectId ); + projectVersionMetadataModel.setId( projectVersion ); + projectVersionMetadataModel.setNamespace( namespace ); + projectVersionMetadataModelEntityManager.put( projectVersionMetadataModel ); + // FIXME collections ??? + } + // now facets updateFacets( artifactMeta, artifactMetadataModel ); @@ -1464,6 +1480,14 @@ public class CassandraMetadataRepository if ( projectVersionMetadataModel == null ) { + projectVersionMetadataModelEntityManager.visitAll( new Function() + { + @Override + public Boolean apply( ProjectVersionMetadataModel projectVersionMetadataModel ) + { + return Boolean.TRUE; + } + } ); return null; }