Repository: jclouds Updated Branches: refs/heads/master 83d10e819 -> 46759f8bd
Fix a few Coverity defects Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/46759f8b Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/46759f8b Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/46759f8b Branch: refs/heads/master Commit: 46759f8bda00f86ef934345846e22e2bd2b0d7ae Parents: 83d10e8 Author: Andrew Gaul <[email protected]> Authored: Sun Nov 5 16:42:31 2017 -0800 Committer: Andrew Gaul <[email protected]> Committed: Sun Nov 5 20:12:47 2017 -0800 ---------------------------------------------------------------------- .../org/jclouds/cloudstack/domain/Capacity.java | 2 +- .../v1/blobstore/RegionScopedSwiftBlobStore.java | 17 +++++++++++++++-- .../rest/config/ReadAnnotationsAndProperties.java | 3 ++- .../java/org/jclouds/ssh/jsch/JschSshClient.java | 2 +- .../parser/ParseToResumableUpload.java | 2 +- ...tatusFromPayloadHttpCommandExecutorService.java | 2 +- .../strategy/SoftLayerComputeServiceAdapter.java | 2 +- 7 files changed, 22 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/46759f8b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java index baca2e1..bcd17a2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java @@ -281,7 +281,7 @@ public class Capacity implements Comparable<Capacity> { public int compareTo(Capacity other) { int comparison = this.zoneId.compareTo(other.zoneId); if (comparison == 0) comparison = this.podId.compareTo(other.podId); - if (comparison == 0) Integer.valueOf(this.type.code).compareTo(other.type.code); + if (comparison == 0) comparison = Integer.valueOf(this.type.code).compareTo(other.type.code); return comparison; } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/46759f8b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java index da50532..1086afe 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java @@ -114,6 +114,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.io.ByteSource; import com.google.common.io.ByteStreams; +import com.google.common.io.Closeables; import com.google.common.net.HttpHeaders; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -758,7 +759,13 @@ public class RegionScopedSwiftBlobStore implements BlobStore { SwiftObject object = api.getObjectApi(regionId, containerName) .get(objectName, org.jclouds.http.options.GetOptions.Builder.range(begin, end)); // Download first, this is the part that usually fails - byte[] targetArray = ByteStreams.toByteArray(object.getPayload().openStream()); + byte[] targetArray; + InputStream is = object.getPayload().openStream(); + try { + targetArray = ByteStreams.toByteArray(is); + } finally { + Closeables.closeQuietly(is); + } // Map file region MappedByteBuffer out = raf.getChannel().map(FileChannel.MapMode.READ_WRITE, begin, end - begin + 1); out.put(targetArray); @@ -898,7 +905,13 @@ public class RegionScopedSwiftBlobStore implements BlobStore { long time = System.nanoTime(); SwiftObject object = api.getObjectApi(regionId, containerName) .get(objectName, org.jclouds.http.options.GetOptions.Builder.range(begin, end)); - byte[] downloadedBlock = ByteStreams.toByteArray(object.getPayload().openStream()); + byte[] downloadedBlock; + InputStream is = object.getPayload().openStream(); + try { + downloadedBlock = ByteStreams.toByteArray(is); + } finally { + Closeables.closeQuietly(is); + } return downloadedBlock; } catch (IOException e) { logger.debug(e.toString()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/46759f8b/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java b/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java index 8115406..478aaef 100644 --- a/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java +++ b/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java @@ -24,6 +24,7 @@ import static org.jclouds.util.Maps2.transformKeys; import static org.jclouds.util.Predicates2.startsWith; import java.util.Map; +import java.util.regex.Pattern; import javax.inject.Inject; import javax.inject.Named; @@ -107,7 +108,7 @@ public class ReadAnnotationsAndProperties implements InvocationConfig { }); return transformKeys(longsByName, new Function<String, String>() { public String apply(String input) { - return input.replaceFirst(PROPERTY_TIMEOUTS_PREFIX, ""); + return input.replaceFirst(Pattern.quote(PROPERTY_TIMEOUTS_PREFIX), ""); } }); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/46759f8b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java ---------------------------------------------------------------------- diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java index c378649..255bc79 100644 --- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java +++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java @@ -275,7 +275,7 @@ public class JschSshClient implements SshClient { try { sftp.put(is, path); } finally { - Closeables2.closeQuietly(contents); + Closeables2.closeQuietly(is); } return null; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/46759f8b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/parser/ParseToResumableUpload.java ---------------------------------------------------------------------- diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/parser/ParseToResumableUpload.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/parser/ParseToResumableUpload.java index bfeca99..afd2f88 100644 --- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/parser/ParseToResumableUpload.java +++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/parser/ParseToResumableUpload.java @@ -49,7 +49,7 @@ public class ParseToResumableUpload implements Function<HttpResponse, ResumableU } } - return ResumableUpload.create(response.getStatusCode(), uploadId, contentLength, upperLimit, lowerLimit); + return ResumableUpload.create(response.getStatusCode(), uploadId, contentLength, lowerLimit, upperLimit); } // Return the Id of the Upload http://git-wip-us.apache.org/repos/asf/jclouds/blob/46759f8b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorService.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorService.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorService.java index 8b0f47d..4e337ff 100644 --- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorService.java +++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorService.java @@ -137,7 +137,7 @@ public class ResponseStatusFromPayloadHttpCommandExecutorService extends JavaUrl char[] chars = new char[size]; byte[] bytes = new byte[size]; - is.read(bytes, 0, size); + ByteStreams.readFully(is, bytes); for (int i = 0; i < size;) chars[i] = (char) (bytes[i++] & 0xff); http://git-wip-us.apache.org/repos/asf/jclouds/blob/46759f8b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java index e5f34f6..577f2fc 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java @@ -164,7 +164,7 @@ public class SoftLayerComputeServiceAdapter implements } else { VirtualGuestBlockDeviceTemplateGroup blockDeviceTemplateGroup = VirtualGuestBlockDeviceTemplateGroup .builder().globalIdentifier(imageId).build(); - virtualGuestBuilder.blockDeviceTemplateGroup(blockDeviceTemplateGroup).build(); + virtualGuestBuilder.blockDeviceTemplateGroup(blockDeviceTemplateGroup); } // set multi-disks if (!templateOptions.getBlockDevices().isEmpty()) {
