You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/06/05 12:23:49 UTC
svn commit: r1489796 -
/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Author: olamy
Date: Wed Jun 5 10:23:48 2013
New Revision: 1489796
URL: http://svn.apache.org/r1489796
Log:
fix getNamespaces
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=1489796&r1=1489795&r2=1489796&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 Wed Jun 5 10:23:48 2013
@@ -278,8 +278,6 @@ public class CassandraMetadataRepository
repository = new Repository( repositoryId );
Namespace namespace = new Namespace( namespaceId, repository );
- //namespace.setRepository( repository );
- //repository.getNamespaces().add( namespace );
this.repositoryEntityManager.put( repository );
this.namespaceEntityManager.put( namespace );
@@ -514,7 +512,10 @@ public class CassandraMetadataRepository
if ( namespace != null && namespace.getRepository() != null && StringUtils.equalsIgnoreCase( repoId,
namespace.getRepository().getId() ) )
{
- if ( StringUtils.startsWith( namespace.getName(), namespaceId ) )
+ String currentNamespace = namespace.getName();
+ // we only return childs
+ if ( StringUtils.startsWith( currentNamespace, namespaceId ) && (
+ StringUtils.length( currentNamespace ) > StringUtils.length( namespaceId ) ) )
{
namespaces.add( namespace );
}