You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2009/09/09 10:46:37 UTC
svn commit: r812828 -
/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java
Author: delos
Date: Wed Sep 9 08:46:37 2009
New Revision: 812828
URL: http://svn.apache.org/viewvc?rev=812828&view=rev
Log:
GERONIMODEVTOOLS-361 Avoid Nullpointer exception when using module version
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java?rev=812828&r1=812827&r2=812828&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java Wed Sep 9 08:46:37 2009
@@ -112,12 +112,20 @@
parent.setVersion( dep.getVersion() );
parent.setType( dep.getType() );
- String configId = dep.getGroupId().concat("/")
- .concat(dep.getArtifactId()).concat("/")
- .concat(dep.getVersion()).concat("/")
- .concat(dep.getType());
+ StringBuilder configId = new StringBuilder();
+ if (dep.getGroupId()!=null)
+ configId.append(dep.getGroupId());
+ configId.append("/");
+ if (dep.getArtifactId()!=null)
+ configId.append(dep.getArtifactId());
+ configId.append("/");
+ if (dep.getVersion()!=null)
+ configId.append(dep.getVersion());
+ configId.append("/");
+ if (dep.getType()!=null)
+ configId.append(dep.getType());
- if (!DeploymentUtils.isInstalledModule(server,configId))
+ if (!DeploymentUtils.isInstalledModule(server,configId.toString()))
dm.addDependency( child, parent );
}
}