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/05/15 10:10:49 UTC
svn commit: r1338586 - 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: Tue May 15 08:10:48 2012
New Revision: 1338586
URL: http://svn.apache.org/viewvc?rev=1338586&view=rev
Log:
[KARAF-1465] Fix cluster:group-set command for remote node
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=1338586&r1=1338585&r2=1338586&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 Tue May 15 08:10:48 2012
@@ -49,9 +49,8 @@ public class ManageGroupCommandHandler e
purgeGroups();
joinGroup(Configurations.DEFAULT_GROUP_NAME);
} else if (ManageGroupAction.SET.equals(action)) {
- if (command.getSourceGroup() != null) {
- quitGroup(command.getSourceGroup().getName());
- }
+ Group localGroup = groupManager.listLocalGroups().iterator().next();
+ quitGroup(localGroup.getName());
joinGroup(targetGroupName);
}
@@ -81,7 +80,6 @@ public class ManageGroupCommandHandler e
* @param targetGroupName
*/
public void joinGroup(String targetGroupName) {
- LOGGER.info("CELLAR GROUP: Joining group {}.",targetGroupName);
Node node = clusterManager.getNode();
Map<String, Group> groups = groupManager.listGroups();
if (groups != null && !groups.isEmpty()) {
@@ -102,7 +100,6 @@ public class ManageGroupCommandHandler e
* @param targetGroupName
*/
public void quitGroup(String targetGroupName) {
- LOGGER.info("CELLAR GROUP: Quiting group {}.",targetGroupName);
Node node = clusterManager.getNode();
Map<String, Group> groups = groupManager.listGroups();
if (groups != null && !groups.isEmpty()) {
@@ -118,7 +115,6 @@ public class ManageGroupCommandHandler e
* Removes {@link Node} from ALL {@link Group}s.
*/
public void purgeGroups() {
- LOGGER.info("CELLAR GROUP: Purging all groups from node.");
Node node = clusterManager.getNode();
Set<String> groupNames = groupManager.listGroupNames(node);
if (groupNames != null && !groupNames.isEmpty()) {
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=1338586&r1=1338585&r2=1338586&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 Tue May 15 08:10:48 2012
@@ -37,8 +37,7 @@ public class GroupSetCommand extends Gro
return null;
}
- Group localGroup = groupManager.listLocalGroups().iterator().next();
- return doExecute(ManageGroupAction.SET, groupName, localGroup, nodes,false);
+ return doExecute(ManageGroupAction.SET, groupName, null, nodes, false);
}
}