You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2007/06/07 15:09:36 UTC
svn commit: r545163 -
/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Author: dwoods
Date: Thu Jun 7 06:09:35 2007
New Revision: 545163
URL: http://svn.apache.org/viewvc?view=rev&rev=545163
Log:
GERONIMO-2605 NPE if exporting plugin for module having dependency on module with no groupId
Modified:
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?view=diff&rev=545163&r1=545162&r2=545163
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Thu Jun 7 06:09:35 2007
@@ -1566,7 +1566,7 @@
private PluginMetadata.Prerequisite processDependencyList(List real, PluginMetadata.Prerequisite prereq, List deps) {
for (int i = 0; i < real.size(); i++) {
Dependency dep = (Dependency) real.get(i);
- if(dep.getArtifact().getGroupId().equals("geronimo")) {
+ if ((dep.getArtifact().getGroupId() != null) && (dep.getArtifact().getGroupId().equals("geronimo"))) {
if(dep.getArtifact().getArtifactId().indexOf("jetty") > -1) {
if(prereq == null) {
prereq = new PluginMetadata.Prerequisite(dep.getArtifact(), true, "Web Container", "This plugin works with the Geronimo/Jetty distribution. It is not intended to run in the Geronimo/Tomcat distribution. There is a separate version of this plugin that works with Tomcat.");