bug 11137: don't start HTTP listen if it is already started

This commit is contained in:
Kelven Yang 2011-08-15 18:56:15 -07:00
parent 11d06f3d6a
commit 085bd36035

View File

@ -318,7 +318,7 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
private void launchConsoleProxy(final byte[] ksBits, final String ksPassword) { private void launchConsoleProxy(final byte[] ksBits, final String ksPassword) {
final Object resource = this; final Object resource = this;
if(_consoleProxyMain == null) {
_consoleProxyMain = new Thread(new Runnable() { _consoleProxyMain = new Thread(new Runnable() {
public void run() { public void run() {
try { try {
@ -350,6 +350,9 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
}, "Console-Proxy-Main"); }, "Console-Proxy-Main");
_consoleProxyMain.setDaemon(true); _consoleProxyMain.setDaemon(true);
_consoleProxyMain.start(); _consoleProxyMain.start();
} else {
s_logger.error("com.cloud.consoleproxy.ConsoleProxy is already running");
}
} }
public boolean authenticateConsoleAccess(String host, String port, String vmId, String sid, String ticket) { public boolean authenticateConsoleAccess(String host, String port, String vmId, String sid, String ticket) {