NULL safety

Author: chrjohn

quickfixj-base/src/main/java/quickfix/DataDictionary.java

@@ -596,6 +596,7 @@ private static <V> void copyCollection(Collection<V> lhs, Collection<V> rhs) {
      * Validate a message, including the header and trailer fields.
      *
      * @param message the message
+     * @param settings 
      * @throws IncorrectTagValue if a field value is not valid
      * @throws FieldNotFound if a field cannot be found
      * @throws IncorrectDataFormat if a field value has a wrong data type
@@ -610,6 +611,7 @@ public void validate(Message message, ValidationSettings settings) throws Incorr
      *
      * @param message the message
      * @param bodyOnly whether to validate just the message body, or to validate the header and trailer sections as well.
+     * @param settings 
      * @throws IncorrectTagValue if a field value is not valid
      * @throws FieldNotFound if a field cannot be found
      * @throws IncorrectDataFormat if a field value has a wrong data type
@@ -623,7 +625,10 @@ static void validate(Message message, DataDictionary sessionDataDictionary,
             DataDictionary applicationDataDictionary, ValidationSettings settings) throws IncorrectTagValue, FieldNotFound,
             IncorrectDataFormat {
         final boolean bodyOnly = sessionDataDictionary == null;
-
+        if (settings == null) {
+            settings = new ValidationSettings();
+        }
+        
         if (isVersionSpecified(sessionDataDictionary)
                 && !sessionDataDictionary.getVersion().equals(
                         message.getHeader().getString(BeginString.FIELD))

quickfixj-base/src/main/java/quickfix/Message.java

@@ -599,6 +599,9 @@ public void fromString(String messageData, DataDictionary sessionDictionary,
         if (sessionDictionary.isAdminMessage(MessageUtils.getMessageType(messageData))) {
             applicationDictionary = sessionDictionary;
         }
+        if (validationSettings == null) {
+            validationSettings = new ValidationSettings();
+        }
         parse(messageData, sessionDictionary, applicationDictionary, validationSettings, doValidation, validateChecksum);
     }