@@ -40,7 +40,7 @@ public class YamlDataFile implements UpdatableYamlDataSource
4040 private boolean isLoaded = false ;
4141 private boolean isUpdated = false ;
4242 private boolean isNewlyCreated = false ;
43- private @ NullOr Exception invalid = null ;
43+ private @ NullOr Exception invalidReason = null ;
4444 private @ NullOr Runnable reloadHandler = null ;
4545
4646 public YamlDataFile (Path directoryPath , String name )
@@ -77,23 +77,25 @@ public YamlDataFile(Path directoryPath, String name, Load load, Consumer<Excepti
7777
7878 public boolean isNewlyCreated () { return isNewlyCreated ; }
7979
80- public boolean isInvalid () { return invalid != null ; }
80+ public boolean isInvalid () { return invalidReason != null ; }
8181
82- public @ NullOr Exception getInvalidReason () { return invalid ; }
82+ public @ NullOr Exception getInvalidReason () { return invalidReason ; }
8383
8484 public final int totalReloads () { return reloads ; }
8585
8686 protected void reloadsWith (Runnable reloadHandler )
8787 {
88- this .reloadHandler = Objects .requireNonNull (reloadHandler , "reloadHandler" );
88+ Objects .requireNonNull (reloadHandler , "reloadHandler" );
89+ this .reloadHandler = reloadHandler ;
90+
91+ // Only run if already loaded
8992 if (isLoaded ) { reloadHandler .run (); }
90- else { reload (); } // reload handler is called in reload
9193 }
9294
9395 public final void reload ()
9496 {
9597 reloads ++;
96- invalid = null ;
98+ invalidReason = null ;
9799 boolean isAlreadyLoaded = isLoaded ;
98100
99101 if (Files .isRegularFile (filePath ))
@@ -105,7 +107,7 @@ public final void reload()
105107 }
106108 catch (InvalidConfigurationException | IOException | RuntimeException e )
107109 {
108- invalid = e ;
110+ invalidReason = e ;
109111 exceptions .accept (e );
110112 }
111113 }
0 commit comments