From 023aac8bd12ccc57d9ee826e4e6282b60937e625 Mon Sep 17 00:00:00 2001
From: Wei Zhou <w.zhou@leaseweb.com>
Date: Wed, 10 Jul 2013 12:20:57 +0200
Subject: [PATCH] CLOUDSTACK-3438: update CPVM SSL certificate for both Premium
 and non-Premium cases

---
 client/WEB-INF/web.xml                        |  2 ++
 .../com/cloud/consoleproxy/AgentHookBase.java | 21 +++++++------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/client/WEB-INF/web.xml b/client/WEB-INF/web.xml
index da2f13c8cf7..e5c05d3fd20 100644
--- a/client/WEB-INF/web.xml
+++ b/client/WEB-INF/web.xml
@@ -45,11 +45,13 @@
     <servlet>
         <servlet-name>apiServlet</servlet-name>
         <servlet-class>com.cloud.api.ApiServlet</servlet-class>
+        <load-on-startup>5</load-on-startup>
     </servlet>
     
     <servlet>
         <servlet-name>consoleServlet</servlet-name>
         <servlet-class>com.cloud.servlet.ConsoleProxyServlet</servlet-class>
+        <load-on-startup>6</load-on-startup>
     </servlet>
 	
 	<servlet>
diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java b/server/src/com/cloud/consoleproxy/AgentHookBase.java
index 160810d1da3..f051686e5f0 100644
--- a/server/src/com/cloud/consoleproxy/AgentHookBase.java
+++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java
@@ -197,22 +197,15 @@ public abstract class AgentHookBase implements AgentHook {
     @Override
     public void startAgentHttpHandlerInVM(StartupProxyCommand startupCmd) {
         StartConsoleProxyAgentHttpHandlerCommand cmd = null;
-        if (_configDao.isPremium()) {
-            String storePassword = String.valueOf(_random.nextLong());
-            byte[] ksBits =
-                    _ksMgr.getKeystoreBits(ConsoleProxyManager.CERTIFICATE_NAME, ConsoleProxyManager.CERTIFICATE_NAME,
-                            storePassword);
+        String storePassword = String.valueOf(_random.nextLong());
+        byte[] ksBits = _ksMgr.getKeystoreBits(ConsoleProxyManager.CERTIFICATE_NAME, ConsoleProxyManager.CERTIFICATE_NAME, storePassword);
 
-            assert (ksBits != null);
-            if (ksBits == null) {
-                s_logger.error("Could not find and construct a valid SSL certificate");
-            }
-            cmd = new StartConsoleProxyAgentHttpHandlerCommand(ksBits, storePassword);
-            cmd.setEncryptorPassword(getEncryptorPassword());
-        } else {
-            cmd = new StartConsoleProxyAgentHttpHandlerCommand();
-            cmd.setEncryptorPassword(getEncryptorPassword());
+        assert (ksBits != null);
+        if (ksBits == null) {
+            s_logger.error("Could not find and construct a valid SSL certificate");
         }
+        cmd = new StartConsoleProxyAgentHttpHandlerCommand(ksBits, storePassword);
+        cmd.setEncryptorPassword(getEncryptorPassword());
 
         try {