You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/06/15 11:06:51 UTC
[01/13] git commit: updated refs/heads/master to 967da97
Repository: cloudstack
Updated Branches:
refs/heads/master 509c83bc7 -> 967da97f5
Fix findbugs warning in LibvirtConsoleProxyLoadCommandWrapper Encoding is now specified in both server and clients for the console proxy getstatus command For some reason, findbugs did not detect unsafe encoding issue in ConsoleProxyResource.java, is properly specified now though... CitrixConsoleProxyLoadCommandWrapper was specifying system default encoding for operation, should be ok because default for xenserver is UTF-8 since it's linux based, but it's best to specify exact encoding set on the server end to be consistent
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/949e97de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/949e97de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/949e97de
Branch: refs/heads/master
Commit: 949e97dec65615e8c79d51b23b9be4b69c4e889c
Parents: 509c83b
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sat Jun 13 01:46:26 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:04:18 2015 +0300
----------------------------------------------------------------------
.../cloud/agent/resource/consoleproxy/ConsoleProxyResource.java | 2 +-
.../resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java | 4 ++--
.../wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java | 4 ++--
.../src/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/949e97de/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
index 16173aa..08f0982 100644
--- a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
+++ b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
@@ -149,7 +149,7 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
final URLConnection conn = url.openConnection();
final InputStream is = conn.getInputStream();
- final BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(is,"UTF-8"));
final StringBuilder sb2 = new StringBuilder();
String line = null;
try {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/949e97de/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java
index 125a295..1a2f7cb 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java
@@ -50,7 +50,7 @@ public abstract class LibvirtConsoleProxyLoadCommandWrapper<T extends Command, A
final URLConnection conn = url.openConnection();
final InputStream is = conn.getInputStream();
- final BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(is,"UTF-8"));
final StringBuilder sb2 = new StringBuilder();
String line = null;
try {
@@ -75,4 +75,4 @@ public abstract class LibvirtConsoleProxyLoadCommandWrapper<T extends Command, A
return new ConsoleProxyLoadAnswer(cmd, proxyVmId, proxyVmName, success, result);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/949e97de/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java
index 4b863a2..30a6a1b 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java
@@ -55,7 +55,7 @@ public abstract class CitrixConsoleProxyLoadCommandWrapper<T extends Command, A
conn.setReadTimeout(5000);
final InputStream is = conn.getInputStream();
- final BufferedReader reader = new BufferedReader(new InputStreamReader(is, Charset.defaultCharset()));
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(is,"UTF-8"));
final StringBuilder sb2 = new StringBuilder();
String line = null;
try {
@@ -80,4 +80,4 @@ public abstract class CitrixConsoleProxyLoadCommandWrapper<T extends Command, A
return new ConsoleProxyLoadAnswer(cmd, proxyVmId, proxyVmName, success, result);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/949e97de/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java
index 76d1369..71ce5a7 100644
--- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java
+++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java
@@ -63,7 +63,7 @@ public class ConsoleProxyCmdHandler implements HttpHandler {
Headers hds = t.getResponseHeaders();
hds.set("Content-Type", "text/plain");
t.sendResponseHeaders(200, 0);
- OutputStreamWriter os = new OutputStreamWriter(t.getResponseBody());
+ OutputStreamWriter os = new OutputStreamWriter(t.getResponseBody(),"UTF-8");
statsCollector.getStatsReport(os);
os.close();
}
[07/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Fix 3 findbugs encoding warnings Vmdk descriptor files used by ESX should be UTF-8 encoded
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/333d0e20
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/333d0e20
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/333d0e20
Branch: refs/heads/master
Commit: 333d0e20694dfe625fcc7cb2862c5d05016ed8c6
Parents: f5f9388
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 12:09:01 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:05:08 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/333d0e20/vmware-base/src/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java
index 8aecfdd..fdce93c 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VmdkFileDescriptor.java
@@ -39,7 +39,7 @@ public class VmdkFileDescriptor {
public void parse(byte[] vmdkFileContent) throws IOException {
BufferedReader in = null;
try {
- in = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(vmdkFileContent)));
+ in = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(vmdkFileContent),"UTF-8"));
String line;
while ((line = in.readLine()) != null) {
// ignore empty and comment lines
@@ -93,8 +93,8 @@ public class VmdkFileDescriptor {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
try {
- in = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(vmdkContent)));
- out = new BufferedWriter(new OutputStreamWriter(bos));
+ in = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(vmdkContent),"UTF-8"));
+ out = new BufferedWriter(new OutputStreamWriter(bos,"UTF-8"));
String line;
while ((line = in.readLine()) != null) {
// ignore empty and comment lines
[06/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Fix 3 findbugs warnings OVF and VMX descriptor files should be written in UTF-8
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #404
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/00cdd663
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/00cdd663
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/00cdd663
Branch: refs/heads/master
Commit: 00cdd66351e793323ed72e5c271516604908fe41
Parents: 333d0e2
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 12:23:13 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:05:08 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00cdd663/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index ac5b414..ae8e860 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -21,7 +21,7 @@ import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.URLEncoder;
@@ -1523,7 +1523,7 @@ public class VirtualMachineMO extends BaseMO {
String ovfPath = exportDir + File.separator + exportName + ".ovf";
fileNames.add(ovfPath);
- FileWriter out = new FileWriter(ovfPath);
+ OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(ovfPath),"UTF-8");
out.write(ovfCreateDescriptorResult.getOvfDescriptor());
out.close();
@@ -1592,8 +1592,8 @@ public class VirtualMachineMO extends BaseMO {
boolean replaced = false;
try {
- in = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(vmxContent)));
- out = new BufferedWriter(new OutputStreamWriter(bos));
+ in = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(vmxContent),"UTF-8"));
+ out = new BufferedWriter(new OutputStreamWriter(bos,"UTF-8"));
String line;
while ((line = in.readLine()) != null) {
if (line.startsWith("workingDir")) {
[12/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Fix 1 findbugs warning in VmwareResource.java
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #409
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11fec86b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11fec86b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11fec86b
Branch: refs/heads/master
Commit: 11fec86ba33754ff89791cc96388f35b3ff6b6f2
Parents: 474065e
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 14:00:35 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:06:11 2015 +0300
----------------------------------------------------------------------
.../cloud/hypervisor/vmware/resource/VmwareResource.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11fec86b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index fbcb748..541f748 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -38,6 +38,7 @@ import java.util.Random;
import java.util.Set;
import java.util.TimeZone;
import java.util.UUID;
+import java.io.UnsupportedEncodingException;
import javax.naming.ConfigurationException;
@@ -3573,7 +3574,13 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
}
private static String getSecondaryDatastoreUUID(String storeUrl) {
- return UUID.nameUUIDFromBytes(storeUrl.getBytes()).toString();
+ String uuid = null;
+ try{
+ uuid=UUID.nameUUIDFromBytes(storeUrl.getBytes("UTF-8")).toString();
+ }catch(UnsupportedEncodingException e){
+ s_logger.warn("Failed to create UUID from string " + storeUrl + ". Bad storeUrl or UTF-8 encoding error." );
+ }
+ return uuid;
}
protected Answer execute(ValidateSnapshotCommand cmd) {
[03/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Fix findbugs encoding warning in LibvirtCreatePrivateTemplateFromVolumeCommandWrapper Libvirt templates should be written in UTF-8, default was already doing that so this just gets rid of the findbugs warning
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #401
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3299f23e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3299f23e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3299f23e
Branch: refs/heads/master
Commit: 3299f23ea2f5867ce289c25b836754f72e347b72
Parents: b869a16
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sat Jun 13 01:58:38 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:04:24 2015 +0300
----------------------------------------------------------------------
.../LibvirtCreatePrivateTemplateFromVolumeCommandWrapper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3299f23e/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromVolumeCommandWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromVolumeCommandWrapper.java
index 00f0e93..4bdebe1 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromVolumeCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreatePrivateTemplateFromVolumeCommandWrapper.java
@@ -137,7 +137,7 @@ public final class LibvirtCreatePrivateTemplateFromVolumeCommandWrapper extends
templateContent += "snapshot.name=" + dateFormat.format(date) + System.getProperty("line.separator");
try(FileOutputStream templFo = new FileOutputStream(templateProp);) {
- templFo.write(templateContent.getBytes());
+ templFo.write(templateContent.getBytes("UTF-8"));
templFo.flush();
}catch(final IOException ex)
{
@@ -175,4 +175,4 @@ public final class LibvirtCreatePrivateTemplateFromVolumeCommandWrapper extends
}
}
}
-}
\ No newline at end of file
+}
[08/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Fix 2 findbugs encoding warnings in VmwareContext.java StreamReaders should use encoding specified in the connection object
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #405
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f03411ca
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f03411ca
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f03411ca
Branch: refs/heads/master
Commit: f03411ca0436c8b52f5e60b0c8820fd1d1ba2ff6
Parents: 00cdd66
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 12:31:06 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:05:16 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/util/VmwareContext.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f03411ca/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
index bec4b37..9992e0a 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
@@ -357,7 +357,7 @@ public class VmwareContext {
}
out.flush();
- br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+ br = new BufferedReader(new InputStreamReader(conn.getInputStream(),conn.getContentEncoding()));
String line;
while ((line = br.readLine()) != null) {
if (s_logger.isTraceEnabled())
@@ -483,7 +483,7 @@ public class VmwareContext {
out.write(content);
out.flush();
- BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+ BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream(),conn.getContentEncoding()));
String line;
while ((line = in.readLine()) != null) {
if (s_logger.isTraceEnabled())
[13/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Fix 2 findbugs warnings in VmwareStorageManagerImpl.java Template files and metadata should be written to file in UTF-8
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #410
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/967da97f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/967da97f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/967da97f
Branch: refs/heads/master
Commit: 967da97f5183c88858090935ee78dcecd28e50a6
Parents: 11fec86
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 14:11:56 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:06:19 2015 +0300
----------------------------------------------------------------------
.../hypervisor/vmware/manager/VmwareStorageManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/967da97f/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
index 34ede03..4d2197a 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
@@ -786,7 +786,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
// TODO a bit ugly here
BufferedWriter out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(installFullPath + "/template.properties")));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(installFullPath + "/template.properties"),"UTF-8"));
out.write("filename=" + templateName + ".ova");
out.newLine();
out.write("description=");
@@ -826,7 +826,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
// TODO a bit ugly here
BufferedWriter out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(installFullPath + "/" + templateName + ".ova.meta")));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(installFullPath + "/" + templateName + ".ova.meta"),"UTF-8"));
out.write("ova.filename=" + templateName + ".ova");
out.newLine();
out.write("version=1.0");
[10/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Fix findbugs warning in VmwareHelper.java Disk descriptors should be written in UTF-8 for Vmware
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #407
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa56faec
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa56faec
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa56faec
Branch: refs/heads/master
Commit: aa56faec5135e0139f7be5014a864e2f491c33b9
Parents: dc64c7e
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 12:39:22 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:05:38 2015 +0300
----------------------------------------------------------------------
vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa56faec/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
index b2b1090..113786b 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
@@ -469,7 +469,7 @@ public class VmwareHelper {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
try {
- out = new BufferedWriter(new OutputStreamWriter(bos));
+ out = new BufferedWriter(new OutputStreamWriter(bos,"UTF-8"));
out.write("disksInChain=" + disksInChain);
out.newLine();
[05/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Fix findbugs encoding warning Vmds files created by ESX are UTF-8 encoded
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #403
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f5f93884
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f5f93884
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f5f93884
Branch: refs/heads/master
Commit: f5f93884d13cce577a035a3f398324485f07d26c
Parents: f8b364b
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 12:02:35 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:05:01 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f5f93884/vmware-base/src/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java
index 79d745e..0499be9 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/SnapshotDescriptor.java
@@ -39,7 +39,7 @@ public class SnapshotDescriptor {
public void parse(byte[] vmsdFileContent) throws IOException {
BufferedReader in = null;
try {
- in = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(vmsdFileContent)));
+ in = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(vmsdFileContent),"UTF-8"));
String line;
while ((line = in.readLine()) != null) {
// TODO, remember to remove this log, temporarily added for debugging purpose
[02/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Remove unused import to fix checkstyle warning
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #400
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b869a163
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b869a163
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b869a163
Branch: refs/heads/master
Commit: b869a1633289a283a441be15da6f4c63f3f6b4de
Parents: 949e97d
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 16:04:35 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:04:19 2015 +0300
----------------------------------------------------------------------
.../wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b869a163/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java
index 30a6a1b..7033458 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java
@@ -25,7 +25,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
-import java.nio.charset.Charset;
import org.apache.log4j.Logger;
[11/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Fix findbugs encoding warning in VmwareServerDiscoverer.java Input string should only contain safe characters, since it's derived from a Long object. This just gets rid of the findbugs warning
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #408
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/474065e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/474065e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/474065e9
Branch: refs/heads/master
Commit: 474065e98b57d666dc4f6403242fd55a201aed25
Parents: aa56fae
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 13:38:09 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:06:01 2015 +0300
----------------------------------------------------------------------
.../com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/474065e9/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
index 1a8f8da..ca98c4f 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
@@ -398,7 +398,11 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer
}
// place a place holder guid derived from cluster ID
- cluster.setGuid(UUID.nameUUIDFromBytes(String.valueOf(clusterId).getBytes()).toString());
+ try{
+ cluster.setGuid(UUID.nameUUIDFromBytes(String.valueOf(clusterId).getBytes("UTF-8")).toString());
+ }catch(UnsupportedEncodingException e){
+ throw new DiscoveredWithErrorException("Unable to create UUID based on string " + String.valueOf(clusterId) + ". Bad clusterId or UTF-8 encoding error.");
+ }
_clusterDao.update(clusterId, cluster);
// Flag cluster discovery success
failureInClusterDiscovery = false;
[04/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Was safe either way as this piece of code should only run in linux, this just gets rid of the findbugs warning
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #402
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f8b364b7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f8b364b7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f8b364b7
Branch: refs/heads/master
Commit: f8b364b7c71c9ad92d8307557471f4f6c8eef1ed
Parents: 3299f23
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 00:04:44 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:04:47 2015 +0300
----------------------------------------------------------------------
.../kvm/src/org/apache/cloudstack/utils/linux/MemStat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f8b364b7/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/MemStat.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/MemStat.java b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/MemStat.java
index 1d6a4fc..2029af3 100644
--- a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/MemStat.java
+++ b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/linux/MemStat.java
@@ -51,7 +51,7 @@ public class MemStat {
public void refresh() {
File f = new File(MEMINFO_FILE);
- try (Scanner scanner = new Scanner(f)) {
+ try (Scanner scanner = new Scanner(f,"UTF-8")) {
parseFromScanner(scanner);
} catch (FileNotFoundException ex) {
throw new RuntimeException("File " + MEMINFO_FILE + " not found:" + ex.toString());
[09/13] git commit: updated refs/heads/master to 967da97
Posted by bh...@apache.org.
Fix findbugs encoding warning ESX responses should be encoded in UTF-8
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #406
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dc64c7e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dc64c7e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dc64c7e8
Branch: refs/heads/master
Commit: dc64c7e84315f89977bcff432c37cc6a9a746482
Parents: f03411c
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 12:34:39 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:05:30 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/util/VmwareContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc64c7e8/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
index 9992e0a..3e9c890 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
@@ -550,7 +550,7 @@ public class VmwareContext {
*/
public String[] listDatastoreDirContent(String urlString) throws Exception {
List<String> fileList = new ArrayList<String>();
- String content = new String(getResourceContent(urlString));
+ String content = new String(getResourceContent(urlString),"UTF-8");
String marker = "</a></td><td ";
int parsePos = -1;
do {