[wsas-java-dev] svn commit r113 - in wsas/java/trunk/modules/samples: CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client Trader/src/org/wso2/wsas/sample/trader

[svn at wso2.com]

Author: azeez
Date: Sat Dec  2 03:17:40 2006
New Revision: 113

Modified:
   wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java
   wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java
Log:
Do not throw ArrayIndexOutOfBoundException is an option is not specified

Modified: wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java
==============================================================================
--- wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java	(original)
+++ wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java	Sat Dec  2 03:17:40 2006
@@ -20,19 +20,15 @@
 import org.apache.sandesha2.client.SandeshaClientConstants;
 import org.apache.sandesha2.client.SandeshaListener;
 import org.apache.sandesha2.client.SequenceReport;
-import org.apache.ws.secpolicy.WSSPolicyException;
 import org.wso2.wsas.security.WSS4JUtil;
-import org.wso2.www.types.client.*;
 import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.www.types.client.*;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import java.io.*;
-import java.math.BigInteger;
 import java.rmi.RemoteException;
 import java.util.Properties;
-import java.net.SocketException;
-
 
 public class Client {
     // command line parameters
@@ -438,7 +434,7 @@
 
         sigCryptoConfig.setProvider("org.apache.ws.security.components.crypto.Merlin");
 
-        String keystore = wso2wsasHome + File.separator + "samples" + 
+        String keystore = wso2wsasHome + File.separator + "samples" +
                           File.separator + "CommodityQuote" + File.separator +
                           "keys" + File.separator + "client.jks";
 
@@ -540,7 +536,7 @@
             BufferedReader console = new BufferedReader(new InputStreamReader(
                     System.in));
 
-            System.out.println("STARTING COMMODITY QUOTE SAMPLE CLIENT");
+            System.out.println("COMMODITY QUOTE SAMPLE CLIENT");
             System.out.println("=============================\n");
 
             Client client = new Client(console, epr, wso2wsasHome);
@@ -595,17 +591,20 @@
 
         for (int i = 0; i < args.length; i = i + 2) {
             String arg = args[i];
-
             if (param.equalsIgnoreCase(arg) && (args.length >= (i + 1))) {
+                if(args.length == i + 1){
+                    System.err.println("Invalid value specified for option " + arg);
+                    printUsage();
+                    System.exit(1);
+                }
                 return args[i + 1];
             }
         }
-
         return null;
     }
 
     private static void printUsage() {
-        System.out.println("============ HELP =============\n\n");
+        System.out.println("\n============ HELP =============\n");
         System.out.println(
                 "Following optional parameters can also be given when running the client\n\n");
         System.out.println(PARAM_QOS +

Modified: wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java
==============================================================================
--- wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java	(original)
+++ wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java	Sat Dec  2 03:17:40 2006
@@ -1044,6 +1044,11 @@
             String arg = args[i];
 
             if (param.equalsIgnoreCase(arg) && (args.length >= (i + 1))) {
+                if (args.length == i + 1) {
+                    System.err.println("Invalid value specified for option " + arg);
+                    printUsage();
+                    System.exit(1);
+                }
                 return args[i + 1];
             }
         }
@@ -1052,7 +1057,7 @@
     }
 
     private static void printUsage() {
-        System.out.println("============ HELP =============\n\n");
+        System.out.println("\n============ HELP =============\n");
         System.out.println(
                 "Following optional parameters can also be given when running the client\n\n");
         System.out.println(PARAM_QOS +