Updated Branches: refs/heads/master efbc7af46 -> 219e3a1df
Fixed null pointer access issue Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/219e3a1d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/219e3a1d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/219e3a1d Branch: refs/heads/master Commit: 219e3a1df35864576307c9f93e51fc28cf524673 Parents: efbc7af Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Thu Jan 16 08:55:07 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Thu Jan 16 08:55:07 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/cli/commands/AddTenantCommand.java | 2 +- .../stratos/cli/commands/AutoscalingPolicyDeploymentCommand.java | 2 +- .../apache/stratos/cli/commands/CartridgeDeploymentCommand.java | 2 +- .../stratos/cli/commands/DeploymentPolicyDeploymentCommand.java | 2 +- .../apache/stratos/cli/commands/PartitionDeploymentCommand.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/219e3a1d/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java index 4b33f6a..56b71db 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java @@ -92,7 +92,7 @@ public class AddTenantCommand implements Command<StratosCommandContext> { logger.debug("Executing {} command...", getName()); } - if (args != null || args.length > 0) { + if (args != null && args.length > 0) { String admin = null; String firstName = null; String lastaName = null; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/219e3a1d/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalingPolicyDeploymentCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalingPolicyDeploymentCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalingPolicyDeploymentCommand.java index 8b46b4b..ae44391 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalingPolicyDeploymentCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalingPolicyDeploymentCommand.java @@ -68,7 +68,7 @@ public class AutoscalingPolicyDeploymentCommand implements Command<StratosComman logger.debug("Executing {} command...", getName()); } - if (args != null || args.length > 0) { + if (args != null && args.length > 0) { String resourcePath = null; String autoscalingPolicyDeployment = null; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/219e3a1d/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java index 881b500..e60461c 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java @@ -68,7 +68,7 @@ public class CartridgeDeploymentCommand implements Command<StratosCommandContext logger.debug("Executing {} command...", getName()); } - if (args != null || args.length > 0) { + if (args != null && args.length > 0) { String resourcePath = null; String cartridgeDeploymentJSON = null; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/219e3a1d/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyDeploymentCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyDeploymentCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyDeploymentCommand.java index 79d2981..75fe52a 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyDeploymentCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyDeploymentCommand.java @@ -68,7 +68,7 @@ public class DeploymentPolicyDeploymentCommand implements Command<StratosCommand logger.debug("Executing {} command...", getName()); } - if (args != null || args.length > 0) { + if (args != null && args.length > 0) { String resourcePath = null; String deploymentPolicyDeployment = null; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/219e3a1d/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionDeploymentCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionDeploymentCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionDeploymentCommand.java index 4ababa1..b1e5989 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionDeploymentCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionDeploymentCommand.java @@ -68,7 +68,7 @@ public class PartitionDeploymentCommand implements Command<StratosCommandContext logger.debug("Executing {} command...", getName()); } - if (args != null || args.length > 0) { + if (args != null && args.length > 0) { String resourcePath = null; String partionDeployment = null;
