svn commit: r1370057 - in /karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management: AdminServiceMBean.java internal/AdminServiceMBeanImpl.java

[jbonofre]

Author: jbonofre
Date: Mon Aug  6 23:17:25 2012
New Revision: 1370057

URL: http://svn.apache.org/viewvc?rev=1370057&view=rev
Log:
[KARAF-1699] Add wait support in admin start operation

Modified:
    
karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java
    
karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java

Modified: 
karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java
URL: 
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java?rev=1370057&r1=1370056&r2=1370057&view=diff
==============================================================================
--- 
karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java
 (original)
+++ 
karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java
 Mon Aug  6 23:17:25 2012
@@ -41,6 +41,7 @@ public interface AdminServiceMBean {
     void changeJavaOpts(String name, String javaopts) throws Exception;
     void destroyInstance(String name) throws Exception;
     void startInstance(String name, String opts) throws Exception;
+    void startInstance(String name, String opts, boolean wait) throws 
Exception;
     void stopInstance(String name) throws Exception;
     void renameInstance(String originalName, String newName) throws Exception;
     void cloneInstance(String name, String cloneName, int sshPort, int 
rmiRegistryPort, int rmiServerPort, String location, String javaOpts) throws 
Exception;

Modified: 
karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java
URL: 
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java?rev=1370057&r1=1370056&r2=1370057&view=diff
==============================================================================
--- 
karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java
 (original)
+++ 
karaf/branches/karaf-2.3.x/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java
 Mon Aug  6 23:17:25 2012
@@ -90,6 +90,24 @@ public class AdminServiceMBeanImpl exten
         getExistingInstance(name).start(opts);
     }
 
+    public void startInstance(String name, String opts, boolean wait) throws 
Exception {
+        Instance child = getExistingInstance(name);
+        if (wait) {
+            String state = child.getState();
+            if (Instance.STOPPED.equals(state)) {
+                child.start(opts);
+            }
+            if (!Instance.STARTED.equals(state)) {
+                do {
+                    Thread.sleep(500);
+                    state = child.getState();
+                } while (Instance.STARTING.equals(state));
+            }
+        } else {
+            child.start(opts);
+        }
+    }
+
     public void stopInstance(String name) throws Exception {
         getExistingInstance(name).stop();
     }