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 699AE10E5E for ; Mon, 24 Mar 2014 01:36:29 +0000 (UTC) Received: (qmail 63058 invoked by uid 500); 24 Mar 2014 01:36:28 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 63009 invoked by uid 500); 24 Mar 2014 01:36:28 -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 63002 invoked by uid 99); 24 Mar 2014 01:36:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Mar 2014 01:36:28 +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, 24 Mar 2014 01:36:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0ACBD2388A2C; Mon, 24 Mar 2014 01:36:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1580689 - /archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Date: Mon, 24 Mar 2014 01:36:04 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140324013605.0ACBD2388A2C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Mon Mar 24 01:36:04 2014 New Revision: 1580689 URL: http://svn.apache.org/r1580689 Log: add NPE check Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1580689&r1=1580688&r2=1580689&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java (original) +++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Mon Mar 24 01:36:04 2014 @@ -844,11 +844,19 @@ public class CassandraMetadataRepository updater.setString( "repositoryName", repositoryId ); updater.setString( "namespaceId", namespaceId ); updater.setString( "id", versionMetadata.getVersion() ); - updater.setString( "description", versionMetadata.getDescription() ); - updater.setString( "name", versionMetadata.getName() ); + if ( StringUtils.isNotEmpty( versionMetadata.getDescription() ) ) + { + updater.setString( "description", versionMetadata.getDescription() ); + } + if ( StringUtils.isNotEmpty( versionMetadata.getName() ) ) + { + updater.setString( "name", versionMetadata.getName() ); + } updater.setString( "incomplete", Boolean.toString( versionMetadata.isIncomplete() ) ); - updater.setString( "url", versionMetadata.getUrl() ); - + if ( StringUtils.isNotEmpty( versionMetadata.getUrl() ) ) + { + updater.setString( "url", versionMetadata.getUrl() ); + } projectVersionMetadataModelTemplate.update( updater ); }