cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: refs/heads/4.1 - CLOUDSTACK-1655: A regression in ConsoleProxy caused by deprecating old URL form
Date Wed, 13 Mar 2013 00:40:01 GMT
Updated Branches:
  refs/heads/4.1 85198980c -> 2323d1a73


CLOUDSTACK-1655: A regression in ConsoleProxy caused by deprecating old URL form


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2323d1a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2323d1a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2323d1a7

Branch: refs/heads/4.1
Commit: 2323d1a730bcd6c7b23e3f289f5782a8c636dbf9
Parents: 8519898
Author: Kelven Yang <kelveny@gmail.com>
Authored: Tue Mar 12 17:26:10 2013 -0700
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Tue Mar 12 20:39:39 2013 -0400

----------------------------------------------------------------------
 .../ConsoleProxyHttpHandlerHelper.java             |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2323d1a7/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java
----------------------------------------------------------------------
diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java
index 7f79bae..6815b0d 100644
--- a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java
+++ b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java
@@ -50,9 +50,10 @@ public class ConsoleProxyHttpHandlerHelper {
             ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(
                 ConsoleProxy.getEncryptorPassword());
     
+            ConsoleProxyClientParam param = encryptor.decryptObject(ConsoleProxyClientParam.class,
map.get("token"));
+
             // make sure we get information from token only
             map.clear();
-            ConsoleProxyClientParam param = encryptor.decryptObject(ConsoleProxyClientParam.class,
map.get("token"));
             if(param != null) {
                 if(param.getClientHostAddress() != null)
                     map.put("host", param.getClientHostAddress());


Mime
View raw message