/*
- * Sone - FcpInterface.java - Copyright © 2011 David Roden
+ * Sone - FcpInterface.java - Copyright © 2011–2012 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
import net.pterodactylus.sone.freenet.fcp.Command.AccessType;
import net.pterodactylus.sone.freenet.fcp.Command.ErrorResponse;
import net.pterodactylus.sone.freenet.fcp.Command.Response;
-import net.pterodactylus.sone.freenet.fcp.FcpException;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.validation.Validation;
import freenet.pluginmanager.FredPluginFCP;
try {
Response response = command.execute(parameters, data, AccessType.values()[accessType]);
sendReply(pluginReplySender, identifier, response);
- } catch (FcpException fe1) {
+ } catch (Exception e1) {
logger.log(Level.WARNING, "Could not process FCP command “%s”.", command);
- sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + fe1.getMessage()));
+ sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + e1.getMessage()));
}
} catch (PluginNotFoundException pnfe1) {
logger.log(Level.WARNING, "Could not find destination plugin: " + pluginReplySender);
* @throws PluginNotFoundException
* if the plugin can not be found
*/
- private void sendReply(PluginReplySender pluginReplySender, String identifier, Response response) throws PluginNotFoundException {
+ private static void sendReply(PluginReplySender pluginReplySender, String identifier, Response response) throws PluginNotFoundException {
SimpleFieldSet replyParameters = response.getReplyParameters();
if (identifier != null) {
replyParameters.putOverwrite("Identifier", identifier);