Commit 5bde2605 authored by Rolf Krahl's avatar Rolf Krahl

Merge branch 'plugin5'

parents 6711a49c 57b2d64c
......@@ -84,7 +84,7 @@
<dependency>
<groupId>org.icatproject</groupId>
<artifactId>ids.plugin</artifactId>
<version>1.3.1</version>
<version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
......
......@@ -54,14 +54,9 @@ public class DfRestorer implements Runnable {
Iterator<DfInfo> iter = dfInfos.iterator();
while (iter.hasNext()) {
DfInfo dfInfo = iter.next();
try {
if (mainStorageInterface.exists(dfInfo.getDfLocation())) {
iter.remove();
fsm.removeFromChanging(dfInfo);
}
} catch (IOException e) {
logger.error("Check on existence of {} failed with {} {}", dfInfo.getDfLocation(), e.getClass(),
e.getMessage());
if (mainStorageInterface.exists(dfInfo.getDfLocation())) {
iter.remove();
fsm.removeFromChanging(dfInfo);
}
}
......
......@@ -62,13 +62,8 @@ public class DsRestorer implements Runnable {
* generally do anything as pointless restores are normally filtered
* out earlier.
*/
try {
if (mainStorageInterface.exists(dsInfo)) {
return;
}
} catch (IOException e) {
logger.error("Check on existence of {} failed with {} {}", dsInfo.getDsLocation(), e.getClass(),
e.getMessage());
if (mainStorageInterface.exists(dsInfo)) {
return;
}
long size = 0;
......
......@@ -6,6 +6,12 @@
<h1>IDS Server Release Notes</h1>
<h2>1.9.2</h2>
<p>Not yet released!</p>
<ul>
<li>Require ids.plugin 1.5.0..</li>
</ul>
<h2>1.9.1</h2>
<p>Bug fix release</p>
<ul>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment