Skip to content

Commit 41c1fdd

Browse files
committed
findbugs: better message and fallback to defaultCharset
1 parent 0851e4e commit 41c1fdd

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
import java.io.File;
2121
import java.io.FileOutputStream;
2222
import java.io.OutputStreamWriter;
23+
import java.io.UnsupportedEncodingException;
2324
import java.net.URI;
25+
import java.nio.charset.Charset;
2426
import java.rmi.RemoteException;
2527
import java.util.ArrayList;
2628
import java.util.HashMap;
@@ -30,7 +32,6 @@
3032
import java.util.concurrent.ExecutorService;
3133
import java.util.concurrent.Executors;
3234
import java.util.concurrent.TimeUnit;
33-
import java.io.UnsupportedEncodingException;
3435

3536
import org.apache.commons.lang.StringUtils;
3637
import org.apache.log4j.Logger;
@@ -108,11 +109,11 @@ public class VmwareStorageProcessor implements StorageProcessor {
108109
private static final Logger s_logger = Logger.getLogger(VmwareStorageProcessor.class);
109110
private static final int DEFAULT_NFS_PORT = 2049;
110111

111-
private VmwareHostService hostService;
112-
private boolean _fullCloneFlag;
113-
private VmwareStorageMount mountService;
114-
private VmwareResource resource;
115-
private Integer _timeout;
112+
private final VmwareHostService hostService;
113+
private final boolean _fullCloneFlag;
114+
private final VmwareStorageMount mountService;
115+
private final VmwareResource resource;
116+
private final Integer _timeout;
116117
protected Integer _shutdownWaitMs;
117118
private final Gson _gson;
118119
private final StorageLayer _storage = new JavaStorageLayer();
@@ -2265,10 +2266,13 @@ public Answer forgetObject(ForgetObjectCmd cmd) {
22652266
}
22662267

22672268
private static String deriveTemplateUuidOnHost(VmwareHypervisorHost hyperHost, String storeIdentifier, String templateName) {
2269+
String templateUuid;
22682270
try{
2269-
String templateUuid = UUID.nameUUIDFromBytes((templateName + "@" + storeIdentifier + "-" + hyperHost.getMor().getValue()).getBytes("UTF-8")).toString();
2271+
templateUuid = UUID.nameUUIDFromBytes((templateName + "@" + storeIdentifier + "-" + hyperHost.getMor().getValue()).getBytes("UTF-8")).toString();
22702272
}catch(UnsupportedEncodingException e){
2271-
s_logger.warn("Unable to generate UUID due to unexpected encoding error."+e);
2273+
s_logger.warn("unexpected encoding error, using default Charset: " + e.getLocalizedMessage());
2274+
templateUuid = UUID.nameUUIDFromBytes((templateName + "@" + storeIdentifier + "-" + hyperHost.getMor().getValue()).getBytes(Charset.defaultCharset()))
2275+
.toString();
22722276
}
22732277
templateUuid = templateUuid.replaceAll("-", "");
22742278
return templateUuid;

0 commit comments

Comments
 (0)