You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/02/11 01:08:24 UTC
svn commit: r505802 -
/geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
Author: jdillon
Date: Sat Feb 10 16:08:23 2007
New Revision: 505802
URL: http://svn.apache.org/viewvc?view=rev&rev=505802
Log:
Fix for option set handling when there is more than one option (this was applied to trunk a while ago)
Modified:
geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
Modified: geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java?view=diff&rev=505802&r1=505801&r2=505802
==============================================================================
--- geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java (original)
+++ geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java Sat Feb 10 16:08:23 2007
@@ -341,10 +341,10 @@
List selected = new ArrayList();
while (stok.hasMoreTokens()) {
String id = stok.nextToken();
- OptionSet set = (OptionSet)map.get(options);
+ OptionSet set = (OptionSet)map.get(id);
if (set == null) {
- if ("default".equals(options)) {
+ if ("default".equals(id)) {
log.debug("Default optionSet selected, but no optionSet defined with that id; ignoring");
}
else {