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:27:41 UTC
svn commit: r1332353 - in /karaf/cellar/branches/cellar-2.2.x:
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:27:41 2012
New Revision: 1332353
URL: http://svn.apache.org/viewvc?rev=1332353&view=rev
Log:
[KARAF-1409] Fix ManageGroupCommandHandler set action when the source group is not set
Modified:
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
Modified: karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java?rev=1332353&r1=1332352&r2=1332353&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java Mon Apr 30 19:27:41 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/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java?rev=1332353&r1=1332352&r2=1332353&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java Mon Apr 30 19:27:41 2012
@@ -33,7 +33,7 @@ public class GroupSetCommand extends Gro
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);