Repository: jclouds-karaf Updated Branches: refs/heads/master d858d8a72 -> 214ec7a0c
JCLOUDS-1191: Avoid NPE and let commands properly print the stacktraces Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/214ec7a0 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/214ec7a0 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/214ec7a0 Branch: refs/heads/master Commit: 214ec7a0cad5b913ed1862274b50808fe267b8a1 Parents: d858d8a Author: Ignasi Barrera <[email protected]> Authored: Thu Oct 27 11:54:07 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Thu Oct 27 11:55:24 2016 +0200 ---------------------------------------------------------------------- .../jclouds/karaf/commands/compute/ComputeCommandWithOptions.java | 2 +- .../org/jclouds/karaf/commands/compute/HardwareListCommand.java | 1 + .../org/jclouds/karaf/commands/compute/ImageCreateCommand.java | 1 + .../java/org/jclouds/karaf/commands/compute/ImageListCommand.java | 1 + .../org/jclouds/karaf/commands/compute/LocationListCommand.java | 1 + .../java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java | 1 + .../org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java | 1 + .../org/jclouds/karaf/commands/compute/NodeDestroyCommand.java | 1 + .../java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java | 1 + .../java/org/jclouds/karaf/commands/compute/NodeListCommand.java | 1 + .../java/org/jclouds/karaf/commands/compute/NodeResumeCommand.java | 1 + .../org/jclouds/karaf/commands/compute/NodeSuspendCommand.java | 1 + .../java/org/jclouds/karaf/commands/compute/RunScriptBase.java | 1 + 13 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java index acf6dd0..656936b 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeCommandWithOptions.java @@ -87,7 +87,7 @@ public abstract class ComputeCommandWithOptions extends ComputeCommandBase { String apiValue = EnvHelper.getComputeApi(api); String identityValue = EnvHelper.getComputeIdentity(identity); String credentialValue = EnvHelper.getComputeCredential(credential); - if (providerValue.equals("google-compute-engine")) { + if (providerValue != null && credentialValue != null && providerValue.equals("google-compute-engine")) { credentialValue = EnvHelper.getGoogleCredentialFromJsonFile(credentialValue); } String endpointValue = EnvHelper.getComputeEndpoint(endpoint); http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/HardwareListCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/HardwareListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/HardwareListCommand.java index ae91c0b..20dd5f7 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/HardwareListCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/HardwareListCommand.java @@ -30,6 +30,7 @@ public class HardwareListCommand extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } printHardwares(service, service.listHardwareProfiles(), System.out); http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageCreateCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageCreateCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageCreateCommand.java index 261cfb7..da51eff 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageCreateCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageCreateCommand.java @@ -42,6 +42,7 @@ public class ImageCreateCommand extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageListCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageListCommand.java index d9a003e..ab9c8db 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageListCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/ImageListCommand.java @@ -35,6 +35,7 @@ public class ImageListCommand extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } printImages(service, service.listImages(), System.out); http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/LocationListCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/LocationListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/LocationListCommand.java index fac41ec..08a7351 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/LocationListCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/LocationListCommand.java @@ -30,6 +30,7 @@ public class LocationListCommand extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } printLocations(service, System.out); http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java index 511f481..5451e6f 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeCreateCommand.java @@ -95,6 +95,7 @@ public class NodeCreateCommand extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java index 994c5ce..78a2814 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyAllCommand.java @@ -37,6 +37,7 @@ public class NodeDestroyAllCommand extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } Set<? extends NodeMetadata> nodeMetadatas = service.destroyNodesMatching(new Predicate<NodeMetadata>() { http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyCommand.java index 93a1bb6..e7be6db 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeDestroyCommand.java @@ -37,6 +37,7 @@ public class NodeDestroyCommand extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java index 6fe361f..dd69441 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeInfoCommand.java @@ -37,6 +37,7 @@ public class NodeInfoCommand extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeListCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeListCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeListCommand.java index f7ef3dd..45a1ff6 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeListCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeListCommand.java @@ -43,6 +43,7 @@ public class NodeListCommand extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeResumeCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeResumeCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeResumeCommand.java index 04e3664..2039e0a 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeResumeCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeResumeCommand.java @@ -34,6 +34,7 @@ public class NodeResumeCommand extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } service.resumeNode(id); http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeSuspendCommand.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeSuspendCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeSuspendCommand.java index 47187bf..2a0c34b 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeSuspendCommand.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/NodeSuspendCommand.java @@ -34,6 +34,7 @@ public class NodeSuspendCommand extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } service.suspendNode(id); http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/214ec7a0/commands/src/main/java/org/jclouds/karaf/commands/compute/RunScriptBase.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/RunScriptBase.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/RunScriptBase.java index 1f0811d..e846987 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/compute/RunScriptBase.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/RunScriptBase.java @@ -67,6 +67,7 @@ public abstract class RunScriptBase extends ComputeCommandWithOptions { service = getComputeService(); } catch (Throwable t) { System.err.println(t.getMessage()); + t.printStackTrace(System.err); return null; } Set<? extends NodeMetadata> nodeMetaDataSet = service.listNodesDetailsMatching(getComputeFilter());
