You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/04/30 21:30:33 UTC
svn commit: r1332354 - in /karaf/cellar/trunk:
core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java
shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
Author: jbonofre
Date: Mon Apr 30 19:30:33 2012
New Revision: 1332354
URL: http://svn.apache.org/viewvc?rev=1332354&view=rev
Log:
[KARAF-1409] Fix the ManageGroupCommandHandler when the event source group is not set
Modified:
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java?rev=1332354&r1=1332353&r2=1332354&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java Mon Apr 30 19:30:33 2012
@@ -49,7 +49,9 @@ public class ManageGroupCommandHandler e
purgeGroups();
joinGroup(Configurations.DEFAULT_GROUP_NAME);
} else if (ManageGroupAction.SET.equals(action)) {
- quitGroup(command.getSourceGroup().getName());
+ if (command.getSourceGroup() != null) {
+ quitGroup(command.getSourceGroup().getName());
+ }
joinGroup(targetGroupName);
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java?rev=1332354&r1=1332353&r2=1332354&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java Mon Apr 30 19:30:33 2012
@@ -23,17 +23,17 @@ import java.util.List;
@Command(scope = "cluster", name = "group-set", description = "Set the target nodes to a cluster group.")
public class GroupSetCommand extends GroupSupport {
- @Argument(index = 0, name = "group", description = "The cluster group name.", required = true, multiValued = false)
+ @Argument(index = 0, name = "group", description = "The cluster group name", required = true, multiValued = false)
String groupName;
- @Argument(index = 1, name = "node", description = "The node(s) ID.", required = false, multiValued = true)
+ @Argument(index = 1, name = "node", description = "The node(s) ID", required = false, multiValued = true)
List<String> nodes;
@Override
protected Object doExecute() throws Exception {
Group group = groupManager.findGroupByName(groupName);
if (group == null) {
- System.err.println("Cluster group " + groupName + " doesn't exist.");
+ System.err.println("Cluster group " + groupName + " doesn't exist");
return null;
}
return doExecute(ManageGroupAction.SET, groupName, null, nodes, false);