Merge remote-tracking branch 'origin/develop' into fb_report_to

labkey-adam · labkey-adam · commit 59f576046bb0 · 2026-01-31T13:30:04.000-08:00
diff --git a/server/embedded/src/org/labkey/embedded/LabKeyServer.java b/server/embedded/src/org/labkey/embedded/LabKeyServer.java
@@ -114,8 +114,6 @@ public static void main(String[] args)
                          {
                             put("logging.log4j2.config.override", String.join(",", Arrays.asList(log4JConfigParts).subList(1, log4JConfigParts.length)));
                          }
-                         else
-                             throw new IllegalArgumentException("log4j.configurationFile must be in the form log4j2.xml[,secondaryFile]");
                      }
                  }
 

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,6 @@ public static void main(String[] args)`
`114`	`114`	`{`
`115`	`115`	`put("logging.log4j2.config.override", String.join(",", Arrays.asList(log4JConfigParts).subList(1, log4JConfigParts.length)));`
`116`	`116`	`}`
`117`		`- else`
`118`		`- throw new IllegalArgumentException("log4j.configurationFile must be in the form log4j2.xml[,secondaryFile]");`
`119`	`117`	`}`
`120`	`118`	`}`
`121`	`119`