X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=d5625c905a9dd075b5167587c3536d8f3c3cda53;hb=ca3084f361acdab99b0e19e872302abd222708ae;hp=ea76a7293f17a4583e5ce9da5014f0a561f3a20e;hpb=57a3d27b6434ca1c426284358d1f69f5687802be;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java index ea76a72..d5625c9 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -568,6 +568,11 @@ public class Core implements IdentityListener { } identityManager.removeContext((OwnIdentity) sone.getIdentity(), "Sone"); identityManager.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition"); + try { + configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null); + } catch (ConfigurationException ce1) { + logger.log(Level.WARNING, "Could not remove Sone from configuration!", ce1); + } } /** @@ -585,7 +590,11 @@ public class Core implements IdentityListener { /* load Sone. */ String sonePrefix = "Sone/" + sone.getId(); - long soneTime = configuration.getLongValue(sonePrefix + "/Time").getValue((long) 0); + Long soneTime = configuration.getLongValue(sonePrefix + "/Time").getValue(null); + if (soneTime == null) { + logger.log(Level.INFO, "Could not load Sone because no Sone has been saved."); + return; + } long soneModificationCounter = configuration.getLongValue(sonePrefix + "/ModificationCounter").getValue((long) 0); /* load profile. */