From 0d9c764bf5411770a4b63a3c29f9788f457f403f Mon Sep 17 00:00:00 2001
From: "Adrian T. Co" <aco@apache.org>
Date: Mon, 3 Jul 2006 05:09:17 +0000
Subject: [PATCH] NPE checking

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@418683 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/activemq/tool/AbstractJmsClientSystem.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java b/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java
index 842b6ab8de..ad92dee18c 100644
--- a/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java
+++ b/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java
@@ -233,6 +233,11 @@ public abstract class AbstractJmsClientSystem extends AbstractObjectProperties {
     protected static Properties parseStringArgs(String[] args) {
         File configFile = null;
         Properties props = new Properties();
+
+        if (args == null || args.length == 0) {
+            return props; // Empty properties
+        }
+        
         for (int i=0; i<args.length; i++) {
             String arg = args[i];
             if (arg.startsWith("-D") || arg.startsWith("-d")) {
@@ -253,7 +258,9 @@ public abstract class AbstractJmsClientSystem extends AbstractObjectProperties {
 
         Properties fileProps = new Properties();
         try {
-            fileProps.load(new FileInputStream(configFile));
+            if (configFile != null) {
+                fileProps.load(new FileInputStream(configFile));
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }