Merge pull request #4177 from IllianiCBT/turnover_contractNpe

Fix NPE Resulting from Null Recruitment Date

Author: SJuliez

Diff for: MekHQ/src/mekhq/campaign/personnel/Person.java

@@ -1882,7 +1882,7 @@ public static Person generateInstanceFromXML(Node wn, Campaign c, Version versio
                         }
                         retVal.originPlanet = p;
                     } catch (NullPointerException e) {
-                        LogManager.getLogger().error("Error loading originPlanet for " + systemId + ", " + planetId, e);
+                        LogManager.getLogger().error("Error loading originPlanet for {}, {}", systemId, planetId, e);
                     }
                 } else if (wn2.getNodeName().equalsIgnoreCase("phenotype")) {
                     retVal.phenotype = Phenotype.parseFromString(wn2.getTextContent().trim());
@@ -2186,7 +2186,7 @@ public static Person generateInstanceFromXML(Node wn, Campaign c, Version versio
                     try {
                         retVal.getOptions().getOption(advName).setValue(value);
                     } catch (Exception e) {
-                        LogManager.getLogger().error("Error restoring advantage: " + adv);
+                        LogManager.getLogger().error("Error restoring advantage: {}", adv);
                     }
                 }
             }
@@ -2201,7 +2201,7 @@ public static Person generateInstanceFromXML(Node wn, Campaign c, Version versio
                     try {
                         retVal.getOptions().getOption(advName).setValue(value);
                     } catch (Exception e) {
-                        LogManager.getLogger().error("Error restoring edge: " + adv);
+                        LogManager.getLogger().error("Error restoring edge: {}", adv);
                     }
                 }
             }
@@ -2216,7 +2216,7 @@ public static Person generateInstanceFromXML(Node wn, Campaign c, Version versio
                     try {
                         retVal.getOptions().getOption(advName).setValue(value);
                     } catch (Exception e) {
-                        LogManager.getLogger().error("Error restoring implants: " + adv);
+                        LogManager.getLogger().error("Error restoring implants: {}", adv);
                     }
                 }
             }
@@ -2225,8 +2225,14 @@ public static Person generateInstanceFromXML(Node wn, Campaign c, Version versio
             if (retVal.getRankNumeric() < 0) {
                 retVal.setRank(0);
             }
+
+            // Fixing recruitment dates
+            // I don't know when this metric was added, so we check all versions
+            if (retVal.getRecruitment() == null) {
+                retVal.setRecruitment(c.getLocalDate());
+            }
         } catch (Exception e) {
-            LogManager.getLogger().error("Failed to read person " + retVal.getFullName() + " from file", e);
+            LogManager.getLogger().error("Failed to read person {} from file", retVal.getFullName(), e);
             retVal = null;
         }