Repository: jclouds-labs Updated Branches: refs/heads/2.0.x 2e41dc90a -> f294ab108
Add extra check on SingleServerApplianceToImage function in case the osFamily is null Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/f294ab10 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/f294ab10 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/f294ab10 Branch: refs/heads/2.0.x Commit: f294ab108dd63283f2fb5b263ec83a2c83f2dcf2 Parents: 2e41dc9 Author: Ali Bazlamit <[email protected]> Authored: Tue May 30 16:37:16 2017 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Tue May 30 16:44:18 2017 +0200 ---------------------------------------------------------------------- .../rest/compute/function/SingleServerApplianceToImage.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/f294ab10/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/compute/function/SingleServerApplianceToImage.java ---------------------------------------------------------------------- diff --git a/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/compute/function/SingleServerApplianceToImage.java b/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/compute/function/SingleServerApplianceToImage.java index 71ab088..28ba70f 100644 --- a/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/compute/function/SingleServerApplianceToImage.java +++ b/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/compute/function/SingleServerApplianceToImage.java @@ -71,6 +71,9 @@ public class SingleServerApplianceToImage implements Function<SingleServerApplia } private static Optional<OsFamily> findInStandardFamilies(final String osFamily) { + if (osFamily == null) { + return Optional.absent(); + } return tryFind(asList(OsFamily.values()), new Predicate<OsFamily>() { @Override public boolean apply(OsFamily input) { @@ -80,6 +83,9 @@ public class SingleServerApplianceToImage implements Function<SingleServerApplia } private static Optional<OsFamily> findInOtherOSMap(final String label) { + if (label == null) { + return Optional.absent(); + } return tryFind(OTHER_OS_MAP.keySet(), new Predicate<String>() { @Override public boolean apply(String input) {
