From e96b05deb6d6d6110e319efbd3b50bbdfd15a4de Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Mon, 12 Feb 2007 05:55:51 +0000 Subject: [PATCH] fix NPE git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@506300 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-configuration/src/main/mdo/configuration.mdo | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-configuration/src/main/mdo/configuration.mdo index 0372ce554..7c38f59cf 100644 --- a/archiva-configuration/src/main/mdo/configuration.mdo +++ b/archiva-configuration/src/main/mdo/configuration.mdo @@ -169,7 +169,7 @@ for ( java.util.Iterator i = getRepositories().iterator(); i.hasNext(); ) { RepositoryConfiguration repository = (RepositoryConfiguration) i.next(); - if ( id.equals( repository.getId() ) ) + if ( id != null ? !id.equals( repository.getId() ) : repository.getId() != null ) { return repository; } @@ -182,7 +182,7 @@ for ( java.util.Iterator i = getSyncedRepositories().iterator(); i.hasNext(); ) { SyncedRepositoryConfiguration repository = (SyncedRepositoryConfiguration) i.next(); - if ( id.equals( repository.getId() ) ) + if ( id != null ? !id.equals( repository.getId() ) : repository.getId() != null ) { return repository; } @@ -195,7 +195,7 @@ for ( java.util.Iterator i = getProxiedRepositories().iterator(); i.hasNext(); ) { ProxiedRepositoryConfiguration repository = (ProxiedRepositoryConfiguration) i.next(); - if ( id.equals( repository.getId() ) ) + if ( id != null ? !id.equals( repository.getId() ) : repository.getId() != null ) { return repository; }