cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [10/50] [abbrv] git commit: updated refs/heads/rbac to 3b58a45
Date Fri, 07 Feb 2014 21:46:19 GMT
Removed some useless imports


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

Branch: refs/heads/rbac
Commit: 03a424e45abe753cd0227efb10eb21e2b9fab53c
Parents: 7f34282
Author: Alex Huang <alex.huang@citrix.com>
Authored: Wed Jan 29 16:21:33 2014 +0000
Committer: Alex Huang <alex.huang@citrix.com>
Committed: Wed Feb 5 01:39:16 2014 +0000

----------------------------------------------------------------------
 .../ConsoleProxyBalanceAllocator.java             |  3 ---
 .../consoleproxy/StaticConsoleProxyManager.java   | 18 ------------------
 2 files changed, 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03a424e4/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java b/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java
index 147063d..2cbd847 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java
@@ -21,7 +21,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
@@ -32,8 +31,6 @@ import com.cloud.vm.ConsoleProxy;
 @Local(value = {ConsoleProxyAllocator.class})
 public class ConsoleProxyBalanceAllocator extends AdapterBase implements ConsoleProxyAllocator
{
 
-    private final Random _rand = new Random(System.currentTimeMillis());
-
     @Override
     public Long allocProxy(List<? extends ConsoleProxy> candidates, final Map<Long,
Integer> loadInfo, long dataCenterId) {
         List<ConsoleProxy> allocationList = new ArrayList<ConsoleProxy>(candidates);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03a424e4/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java
index 27bdcbe..8aa9b0d 100755
--- a/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java
+++ b/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java
@@ -18,23 +18,17 @@ package com.cloud.consoleproxy;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 
 import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.framework.security.keystore.KeystoreDao;
-import org.apache.cloudstack.framework.security.keystore.KeystoreManager;
 
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupProxyCommand;
 import com.cloud.host.Host.Type;
 import com.cloud.host.HostVO;
-import com.cloud.host.dao.HostDao;
 import com.cloud.info.ConsoleProxyInfo;
 import com.cloud.resource.ResourceManager;
 import com.cloud.resource.ResourceStateAdapter;
@@ -43,11 +37,9 @@ import com.cloud.resource.UnableDeleteHostException;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.dao.ConsoleProxyDao;
-import com.cloud.vm.dao.VMInstanceDao;
 
 @Local(value = {ConsoleProxyManager.class})
 public class StaticConsoleProxyManager extends AgentBasedConsoleProxyManager implements ConsoleProxyManager,
ResourceStateAdapter {
-    private static final Logger s_logger = Logger.getLogger(StaticConsoleProxyManager.class);
 
     @Inject
     ConsoleProxyDao _proxyDao;
@@ -55,16 +47,6 @@ public class StaticConsoleProxyManager extends AgentBasedConsoleProxyManager
imp
     ResourceManager _resourceMgr;
     @Inject
     ConfigurationDao _configDao;
-    @Inject
-    private VMInstanceDao _instanceDao;
-    @Inject
-    KeystoreDao _ksDao;
-    @Inject
-    private KeystoreManager _ksMgr;
-    @Inject
-    private HostDao _hostDao;
-    private final Random _random = new Random(System.currentTimeMillis());
-    private String _hashKey;
     private String _ip = null;
 
     public StaticConsoleProxyManager() {


Mime
View raw message