Author: jalkanen
Date: Sat Oct 31 10:58:40 2009
New Revision: 831528
URL: http://svn.apache.org/viewvc?rev=831528&view=rev
Log:
Ensure that tearDown() shuts down the repository even in the event of deletion
failure.
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java?rev=831528&r1=831527&r2=831528&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java Sat
Oct 31 10:58:40 2009
@@ -72,11 +72,16 @@
public void tearDown() throws Exception
{
- m_engine.emptyRepository();
-
- TestEngine.emptyWorkDir();
+ try
+ {
+ m_engine.emptyRepository();
- m_engine.shutdown();
+ TestEngine.emptyWorkDir();
+ }
+ finally
+ {
+ m_engine.shutdown();
+ }
}
public void testNonExistantDirectory()
