OptionImpl now avoids NullPointerExceptions

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@130099 13f79535-47bb-0310-9956-ffa450edef68

Author: Robert James Oxspring

src/java/org/apache/commons/cli2/option/OptionImpl.java

@@ -69,18 +69,29 @@ public boolean equals(final Object thatObj) {
             final OptionImpl that = (OptionImpl)thatObj;
 
             return getId() == that.getId()
-                && getPreferredName().equals(that.getPreferredName())
-                && (getDescription() == that.getDescription()
-                    || getDescription().equals(that.getDescription()))
-                && getPrefixes().equals(that.getPrefixes())
-                && getTriggers().equals(that.getTriggers());
+				&& equals(getPreferredName(),that.getPreferredName())
+				&& equals(getDescription(),that.getDescription())
+				&& equals(getPrefixes(),that.getPrefixes())
+				&& equals(getTriggers(),that.getTriggers());
         }
         else {
             return false;
         }
     }
 
-    public int hashCode() {
+	private boolean equals(Object left, Object right) {
+		if(left==null && right==null){
+			return true;
+		}
+		else if(left==null || right==null){
+			return false;
+		}
+		else{
+			return left.equals(right);
+		}
+	}
+
+	public int hashCode() {
         int hashCode = getId();
         hashCode = hashCode * 37 + getPreferredName().hashCode();
         if (getDescription() != null) {