You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/08/30 23:33:57 UTC
[3/3] git commit: Miscellaneous FindBugs fixes
Miscellaneous FindBugs fixes
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/195998b3
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/195998b3
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/195998b3
Branch: refs/heads/master
Commit: 195998b3b6893c632664e50010b3fb77d7166449
Parents: 5399cb6
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed Aug 27 10:16:53 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat Aug 30 14:33:10 2014 -0700
----------------------------------------------------------------------
.../rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java | 5 +++--
.../src/main/java/org/jclouds/s3/config/S3RestClientModule.java | 2 +-
.../org/jclouds/ovf/xml/internal/BaseVirtualSystemHandler.java | 2 +-
compute/src/main/java/org/jclouds/ssh/SshKeys.java | 3 ++-
4 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/195998b3/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java
index b640b13..a496024 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/binders/UpdateRecordsToJSON.java
@@ -66,8 +66,9 @@ public class UpdateRecordsToJSON implements Binder {
static List<UpdateRecord> toUpdateRecordList(Map<String, Record> idsToRecords) {
List<UpdateRecord> updateRecords = Lists.newArrayList();
- for (String recordId : idsToRecords.keySet()) {
- Record record = idsToRecords.get(recordId);
+ for (Map.Entry<String, Record> entry : idsToRecords.entrySet()) {
+ String recordId = entry.getKey();
+ Record record = entry.getValue();
UpdateRecord updateRecord = new UpdateRecord();
updateRecord.id = recordId;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/195998b3/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java b/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java
index 9086681..23cf033 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java
@@ -121,7 +121,7 @@ public class S3RestClientModule<S extends S3Client, A extends S3AsyncClient> ext
try {
return Optional.fromNullable(client.getBucketLocation(bucket));
} catch (ContainerNotFoundException e) {
- return null;
+ return Optional.absent();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/195998b3/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseVirtualSystemHandler.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseVirtualSystemHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseVirtualSystemHandler.java
index 2fe9c12..37e6030 100644
--- a/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseVirtualSystemHandler.java
+++ b/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseVirtualSystemHandler.java
@@ -64,7 +64,7 @@ public class BaseVirtualSystemHandler<T extends BaseVirtualSystem<T>, B extends
@Inject(optional = true)
protected void setExtensionHandlers(
@Named("VirtualSystem") Map<String, Provider<? extends SectionHandler>> extensionHandlers) {
- extensionHandlers = ImmutableMap.<String, Provider<? extends SectionHandler>> builder().putAll(
+ this.extensionHandlers = ImmutableMap.<String, Provider<? extends SectionHandler>> builder().putAll(
this.extensionHandlers).putAll(extensionHandlers).build();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/195998b3/compute/src/main/java/org/jclouds/ssh/SshKeys.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/ssh/SshKeys.java b/compute/src/main/java/org/jclouds/ssh/SshKeys.java
index 558a301..bcae87e 100644
--- a/compute/src/main/java/org/jclouds/ssh/SshKeys.java
+++ b/compute/src/main/java/org/jclouds/ssh/SshKeys.java
@@ -55,6 +55,7 @@ import com.google.common.collect.ImmutableMap.Builder;
import com.google.common.hash.HashCode;
import com.google.common.hash.Hashing;
import com.google.common.io.ByteSource;
+import com.google.common.io.ByteStreams;
/**
* Utilities for ssh key pairs
@@ -115,7 +116,7 @@ public class SshKeys {
int byte4 = in.read();
int length = (byte1 << 24) + (byte2 << 16) + (byte3 << 8) + (byte4 << 0);
byte[] val = new byte[length];
- in.read(val, 0, length);
+ ByteStreams.readFully(in, val);
return val;
}