merge with branch 1.x

This commit is contained in:
Sebastian Sdorra
2017-06-25 19:01:33 +02:00
81 changed files with 4617 additions and 1319 deletions

View File

@@ -55,7 +55,9 @@ import static org.junit.Assert.*;
import java.io.File;
import java.io.IOException;
import java.util.UUID;
import java.util.logging.Logger;
/**
*
@@ -155,7 +157,11 @@ public class AbstractTestBase
}
finally
{
IOUtil.delete(tempDirectory);
try {
IOUtil.delete(tempDirectory);
} catch (IOException e) {
Logger.getGlobal().warning(String.format("deleting temp <%s> failed: %s", tempDirectory.getAbsolutePath(), e.getMessage()));
}
}
}