Index: pom.xml
===================================================================
--- pom.xml (revision 35646)
+++ pom.xml (working copy)
@@ -3,7 +3,7 @@
org.jvnet.hudson.plugins
plugin
- 1.318
+ 1.379
../pom.xml
backup
Index: src/main/java/org/jvnet/hudson/plugins/backup/utils/RestoreTask.java
===================================================================
--- src/main/java/org/jvnet/hudson/plugins/backup/utils/RestoreTask.java (revision 35646)
+++ src/main/java/org/jvnet/hudson/plugins/backup/utils/RestoreTask.java (working copy)
@@ -26,7 +26,11 @@
import hudson.model.Hudson;
import hudson.util.HudsonIsLoading;
+import org.apache.commons.io.FileUtils;
+import org.jvnet.hudson.plugins.backup.BackupConfig;
+import org.jvnet.hudson.plugins.backup.utils.compress.UnArchiver;
+import javax.servlet.ServletContext;
import java.io.File;
import java.io.IOException;
import java.math.BigDecimal;
@@ -34,14 +38,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.servlet.ServletContext;
-
-import org.apache.commons.io.FileUtils;
-import org.jvnet.hudson.plugins.backup.BackupConfig;
-import org.jvnet.hudson.plugins.backup.utils.compress.UnArchiver;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
-
/**
* This is the restore task, run in background and log to a file
*
@@ -124,11 +120,8 @@
logger.info("Reloading hudson configuration from disk.");
logger.info("*****************************************");
- StaplerRequest request = FakeObject.getStaplerRequestFake(servletContext);
- StaplerResponse response = FakeObject.getStaplerResponseFake();
-
try {
- Hudson.getInstance().doReload(request, response);
+ Hudson.getInstance().doReload();
} catch (IOException e) {
logger.error("Error reloading config files from disk.");
logger.error("Call this method manually");