You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2008/10/20 02:01:02 UTC
svn commit: r706089 -
/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
Author: ctan
Date: Sun Oct 19 17:01:01 2008
New Revision: 706089
URL: http://svn.apache.org/viewvc?rev=706089&view=rev
Log:
merge -r 706085:706086 from continuum-1.2.x branch
[CONTINUUM-1937] fixed NPE when editing project group
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=706089&r1=706088&r2=706089&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Sun Oct 19 17:01:01 2008
@@ -362,14 +362,16 @@
repositories = getContinuum().getRepositoryService().getAllLocalRepositories();
- Project rootProject = ( getContinuum().getProjectsInBuildOrder( getContinuum()
- .getProjectsInGroupWithDependencies( projectGroup.getId() ) ) ).get( 0 );
-
- if (rootProject != null)
+ Collection<Project> projects = getContinuum().getProjectsInGroupWithDependencies( projectGroup.getId() );
+ if ( projects != null && projects.size() > 0 )
{
- setUrl( rootProject.getUrl() );
- }
+ Project rootProject = ( getContinuum().getProjectsInBuildOrder( projects ) ).get( 0 );
+ if (rootProject != null)
+ {
+ setUrl( rootProject.getUrl() );
+ }
+ }
return SUCCESS;
}