X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=c5c88352803d75a0c280a95a9c5b6677053f74b2;hb=920370701919c6cc8b9194af5d1c2c7d6dd8601b;hp=130ce11a08ac615247b221472835c036af350004;hpb=b8c96f32a65f1df01edeb9bd4a4a66c8726ba2dd;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 130ce11..c5c8835 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -44,7 +44,6 @@ import freenet.pluginmanager.FredPluginL10n;
 import freenet.pluginmanager.FredPluginThreadless;
 import freenet.pluginmanager.FredPluginVersioned;
 import freenet.pluginmanager.PluginRespirator;
-import freenet.pluginmanager.PluginStore;
 
 /**
  * This class interfaces with Freenet. It is the class that is loaded by the
@@ -79,7 +78,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 3, 3);
+	public static final Version VERSION = new Version(0, 3, 5, 1);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -96,9 +95,6 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	/** The l10n helper. */
 	private PluginL10n l10n;
 
-	/** The plugin store. */
-	private PluginStore pluginStore;
-
 	/** The identity manager. */
 	private IdentityManager identityManager;
 
@@ -171,7 +167,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		}
 
 		/* create freenet interface. */
-		FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode(), pluginRespirator.getHLSimpleClient());
+		FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
 
 		/* create web of trust connector. */
 		PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
@@ -228,14 +224,8 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 
 			/* stop the identity manager. */
 			identityManager.stop();
-
-			/* TODO wait for core to stop? */
-			try {
-				pluginRespirator.putStore(pluginStore);
-			} catch (DatabaseDisabledException dde1) {
-				logger.log(Level.WARNING, "Could not store plugin store, database is disabled.", dde1);
-			}
-
+		} catch (Throwable t1) {
+			logger.log(Level.SEVERE, "Error while shutting down!", t1);
 		} finally {
 			/* shutdown logger. */
 			Logging.shutdown();