From e85e6d0af6875147e77127f10e0211c014ca28d9 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 10 May 2007 14:16:11 +0000
Subject: [PATCH] This commit addresses several issues that Brian brought up regarding the upgrader.
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java
index 78e3382..b56f22e 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java
@@ -78,6 +78,8 @@
private String[] args = null;
+ private boolean finished = false;
+
private BuildExtractor(String[] args) {
this.args = args;
setProgressMessageFormatter(new PlainTextProgressMessageFormatter());
@@ -140,10 +142,14 @@
private void expandZipFile(File buildFile)
throws ApplicationException, IOException {
- LOG.log(Level.INFO, "expanding zip file " + buildFile.getPath());
- ZipExtractor extractor = new ZipExtractor(buildFile);
- extractor.extract(getStageDirectory());
- LOG.log(Level.INFO, "extraction finished");
+ try {
+ LOG.log(Level.INFO, "expanding zip file " + buildFile.getPath());
+ ZipExtractor extractor = new ZipExtractor(buildFile);
+ extractor.extract(getStageDirectory());
+ LOG.log(Level.INFO, "extraction finished");
+ } finally {
+ finished = true;
+ }
}
private File getStageDirectory() throws ApplicationException {
@@ -191,4 +197,11 @@
public String getSummary(ProgressStep step) {
return null;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isFinished() {
+ return finished;
+ }
}
--
Gitblit v1.10.0