From 6439bba5cc09d6febc59bdc9e0d9bc25f1f1eb18 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 01 Sep 2010 09:04:15 +0000
Subject: [PATCH] Various improvements:

---
 sdk/src/com/sun/opends/sdk/tools/ArgumentParser.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sdk/src/com/sun/opends/sdk/tools/ArgumentParser.java b/sdk/src/com/sun/opends/sdk/tools/ArgumentParser.java
index 546185a..8f60c53 100644
--- a/sdk/src/com/sun/opends/sdk/tools/ArgumentParser.java
+++ b/sdk/src/com/sun/opends/sdk/tools/ArgumentParser.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2006-2009 Sun Microsystems, Inc.
+ *      Copyright 2006-2010 Sun Microsystems, Inc.
  */
 package com.sun.opends.sdk.tools;
 
@@ -327,7 +327,8 @@
 
     if (versionArgument != null)
     {
-      if (shortID == versionArgument.getShortIdentifier())
+      if (shortID != null &&
+          shortID.equals(versionArgument.getShortIdentifier()))
       {
         // Update the version argument to not display its short
         // identifier.

--
Gitblit v1.10.0