svn commit: r755602 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java

[oching]

Author: oching
Date: Wed Mar 18 14:28:39 2009
New Revision: 755602

URL: http://svn.apache.org/viewvc?rev=755602&view=rev
Log:
[MRM-1121]
o added null check in browse at artifact level

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java?rev=755602&r1=755601&r2=755602&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
 Wed Mar 18 14:28:39 2009
@@ -143,6 +143,11 @@
                 ArchivaProjectModel model =
                     repoBrowsing.selectVersion( getPrincipal(), 
getObservableRepos(), groupId, artifactId, version );
                 
+                if( model == null )
+                {
+                    continue;
+                }
+                
                 if( isFirstVersion )
                 {
                     sharedModel = model;
@@ -167,19 +172,19 @@
                         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 );