Fix callback bug

The same callback instance is now used for pre and post actions.
syncany · Nov 1, 2014 · 6021650 · 6021650
1 parent 187fa1d
commit 6021650
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/syncany-cli/src/main/java/org/syncany/cli/AbstractInitCommand.java b/syncany-cli/src/main/java/org/syncany/cli/AbstractInitCommand.java
@@ -186,6 +186,7 @@ private void askNormalPluginSettings(TransferSettings settings, PluginOption opt
 			throws StorageException, InstantiationException, IllegalAccessException {
 
 		Class<? extends PluginOptionCallback> optionCallbackClass = option.getCallback();
+		PluginOptionCallback optionClassBackInstance = optionCallbackClass != null ? optionCallbackClass.newInstance() : null;
 		Class<? extends PluginOptionConverter> optionConverterClass = option.getConverter();
 
 		if (!isInteractive && !knownPluginSettings.containsKey(nestPrefix + option.getName())) {
@@ -195,8 +196,8 @@ else if (knownPluginSettings.containsKey(nestPrefix + option.getName())) {
 			settings.setField(option.getField().getName(), knownPluginSettings.get(nestPrefix + option.getName()));
 		}
 		else {
-			if (optionCallbackClass != null) {
-				out.println(optionCallbackClass.newInstance().preQueryCallback());
+			if (optionClassBackInstance != null) {
+				out.println(optionClassBackInstance.preQueryCallback());
 			}
 
 			String optionValue = askPluginOption(settings, option);
@@ -207,8 +208,8 @@ else if (knownPluginSettings.containsKey(nestPrefix + option.getName())) {
 
 			settings.setField(option.getField().getName(), optionValue);
 
-			if (optionCallbackClass != null) {
-				out.println(optionCallbackClass.newInstance().postQueryCallback(optionValue));
+			if (optionClassBackInstance != null) {
+				out.println(optionClassBackInstance.postQueryCallback(optionValue));
 			}
 		}
 	}