You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/01/26 16:39:00 UTC
git commit: updated refs/heads/4.3-forward to 23a3d99
Updated Branches:
refs/heads/4.3-forward c58e50992 -> 23a3d99fc
findbugs: byte[].toString -> Arrays.toString(byte[])
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23a3d99f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23a3d99f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23a3d99f
Branch: refs/heads/4.3-forward
Commit: 23a3d99fc0836839a88584d7aa6a978d99c5d126
Parents: c58e509
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Jan 26 16:38:53 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Jan 26 16:38:53 2014 +0100
----------------------------------------------------------------------
.../src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23a3d99f/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 8a31d73..3572127 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -17,6 +17,7 @@
package com.cloud.consoleproxy;
import java.nio.charset.Charset;
+import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -118,10 +119,10 @@ import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.db.QueryBuilder;
-import com.cloud.utils.db.TransactionCallbackNoReturn;
-import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallbackNoReturn;
+import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.events.SubscriptionMgr;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
@@ -502,7 +503,7 @@ VirtualMachineGuru, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
byte[] details = proxy.getSessionDetails();
status = gson.fromJson(details != null ? new String(details, Charset.forName("US-ASCII")) : null, ConsoleProxyStatus.class);
} catch (Throwable e) {
- s_logger.warn("Unable to parse proxy session details : " + proxy.getSessionDetails());
+ s_logger.warn("Unable to parse proxy session details : " + Arrays.toString(proxy.getSessionDetails()));
}
if (status != null && status.getConnections() != null) {
@@ -1708,7 +1709,7 @@ VirtualMachineGuru, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
@Inject
public void setConsoleProxyAllocators(List<ConsoleProxyAllocator> consoleProxyAllocators) {
- this._consoleProxyAllocators = consoleProxyAllocators;
+ _consoleProxyAllocators = consoleProxyAllocators;
}
}