Author: olamy
Date: Tue Jun 4 12:58:37 2013
New Revision: 1489422
URL: http://svn.apache.org/r1489422
Log:
fix removeProjectVersion
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=1489422&r1=1489421&r2=1489422&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
Tue Jun 4 12:58:37 2013
@@ -1340,17 +1340,18 @@ public class CassandraMetadataRepository
{
logger.debug( "removeArtifact repositoryId: '{}', namespace: '{}',
project: '{}', version: '{}', id: '{}'",
repositoryId, namespace, project, version, id );
- String key =
+ String key =
new ArtifactMetadataModel.KeyBuilder().withRepositoryId(
repositoryId ).withNamespace( namespace ).withId(
id ).withProjectVersion( version ).withProject( project
).build();
-
ArtifactMetadataModel artifactMetadataModel = new
ArtifactMetadataModel();
artifactMetadataModel.setArtifactMetadataModelId( key );
artifactMetadataModelEntityManager.remove( artifactMetadataModel );
- key = new ProjectVersionMetadataModel.KeyBuilder().withId( version
).withRepository( repositoryId ).withNamespace( namespace ).withProjectId(
project ).build();
+ key =
+ new ProjectVersionMetadataModel.KeyBuilder().withId( version
).withRepository( repositoryId ).withNamespace(
+ namespace ).withProjectId( project ).build();
ProjectVersionMetadataModel projectVersionMetadataModel = new
ProjectVersionMetadataModel();
projectVersionMetadataModel.setRowId( key );
@@ -1636,6 +1637,14 @@ public class CassandraMetadataRepository
}
artifactMetadataModelEntityManager.remove( artifactMetadataModels );
+
+ String key = new
ProjectVersionMetadataModel.KeyBuilder().withProjectId( projectId ).withId(
+ projectVersion ).withRepository( repoId ).withNamespace( namespace
).build();
+
+ ProjectVersionMetadataModel projectVersionMetadataModel = new
ProjectVersionMetadataModel();
+ projectVersionMetadataModel.setRowId( key );
+
+ projectVersionMetadataModelEntityManager.remove(
projectVersionMetadataModel );
}
@Override
