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/04 15:31:12 UTC
svn commit: r1333949 -
/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
Author: jbonofre
Date: Fri May 4 13:31:12 2012
New Revision: 1333949
URL: http://svn.apache.org/viewvc?rev=1333949&view=rev
Log:
[KARAF-1319] Check if a group is empty (no node) before deleting
Modified:
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java?rev=1333949&r1=1333948&r2=1333949&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java Fri May 4 13:31:12 2012
@@ -30,11 +30,19 @@ public class GroupDeleteCommand extends
@Override
protected Object doExecute() throws Exception {
+ // check if the group exists
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;
}
+
+ // check if the group doesn't contain nodes
+ if (group.getNodes() != null && !group.getNodes().isEmpty()) {
+ System.err.println("Cluster group " + groupName + " is not empty");
+ return null;
+ }
+
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());