svn commit: r1487832 - /archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java

[olamy]

Author: olamy
Date: Thu May 30 12:49:06 2013
New Revision: 1487832

URL: http://svn.apache.org/r1487832
Log:
fix possible NPE

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=1487832&r1=1487831&r2=1487832&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
 Thu May 30 12:49:06 2013
@@ -818,6 +818,10 @@ public class CassandraMetadataRepository
         }
 
         MetadataFacetFactory metadataFacetFactory = 
metadataFacetFactories.get( facetId );
+        if ( metadataFacetFactory == null )
+        {
+            return null;
+        }
         MetadataFacet metadataFacet = 
metadataFacetFactory.createMetadataFacet( repositoryId, name );
         Map<String, String> map = new HashMap<String, String>( facets.size() );
         for ( MetadataFacetModel metadataFacetModel : facets )
@@ -1025,6 +1029,10 @@ public class CassandraMetadataRepository
         for ( Map.Entry<String, Map<String, String>> entry : 
facetValuesPerFacet.entrySet() )
         {
             MetadataFacetFactory factory = metadataFacetFactories.get( 
entry.getKey() );
+            if ( factory == null )
+            {
+                continue;
+            }
             MetadataFacet metadataFacet =
                 factory.createMetadataFacet( 
artifactMetadata.getRepositoryId(), entry.getKey() );
             metadataFacet.fromProperties( entry.getValue() );