From: Maria Odea B. Ching <oching@apache.org>
Date: Wed, 18 Mar 2009 14:28:39 +0000 (+0000)
Subject: [MRM-1121]
X-Git-Tag: archiva-1.2~25
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f8051daf108450dd6ff8f7d5a57f348ef0760e41;p=archiva.git

[MRM-1121]
o added null check in browse at artifact level


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755602 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
index b185306c1..8d986cd78 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
@@ -143,6 +143,11 @@ public class BrowseAction
                 ArchivaProjectModel model =
                     repoBrowsing.selectVersion( getPrincipal(), getObservableRepos(), groupId, artifactId, version );
                 
+                if( model == null )
+                {
+                    continue;
+                }
+                
                 if( isFirstVersion )
                 {
                     sharedModel = model;
@@ -167,19 +172,19 @@ public class BrowseAction
                         sharedModel.setDescription( null );
                     }
 
-                    if ( sharedModel.getIssueManagement() != null &&
+                    if ( sharedModel.getIssueManagement() != null && model.getIssueManagement() != null &&
                         !StringUtils.equalsIgnoreCase( sharedModel.getIssueManagement().getUrl(), model.getIssueManagement().getUrl() ) )
                     {
                         sharedModel.setIssueManagement( null );
                     }
 
-                    if ( sharedModel.getCiManagement() != null &&
+                    if ( sharedModel.getCiManagement() != null && model.getCiManagement() != null &&
                         !StringUtils.equalsIgnoreCase( sharedModel.getCiManagement().getUrl(), model.getCiManagement().getUrl() ) )
                     {
                         sharedModel.setCiManagement( null );
                     }
 
-                    if ( sharedModel.getOrganization() != null &&
+                    if ( sharedModel.getOrganization() != null && model.getOrganization() != null && 
                         !StringUtils.equalsIgnoreCase( sharedModel.getOrganization().getName(), model.getOrganization().getName() ) )
                     {
                         sharedModel.setOrganization( null );