Fix continuous build error (reverse part of r22938)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-10-07 10:27:53 +00:00
parent fc0cbe5ae8
commit 839d522808

View File

@@ -50,8 +50,6 @@ import org.alfresco.util.NameMatcher;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
/** /**
@@ -499,23 +497,8 @@ public class AVMServiceLocalTest extends TestCase
public void testSimpleUpdateLD5() throws Exception public void testSimpleUpdateLD5() throws Exception
{ {
Logger lg1 = null;
Level l1 = null;
Logger lg2 = null;
Level l2 = null;
try try
{ {
// TEMP
lg1 = Logger.getLogger("org.alfresco.repo.avm.AVMServiceLocalTest");
l1 = lg1.getLevel();
lg1.setLevel(Level.DEBUG);
lg2 = Logger.getLogger("org.alfresco.repo.avm.OrphanReaper");
l2 = lg2.getLevel();
lg2.setLevel(Level.DEBUG);
logger.debug("start: testSimpleUpdateLD5"); logger.debug("start: testSimpleUpdateLD5");
logger.debug("created 2 stores: main, layer"); logger.debug("created 2 stores: main, layer");
@@ -643,11 +626,6 @@ public class AVMServiceLocalTest extends TestCase
e.printStackTrace(System.err); e.printStackTrace(System.err);
throw e; throw e;
} }
finally
{
lg1.setLevel(l1);
lg2.setLevel(l2);
}
} }
public void testSimpleUpdateLD6() throws Exception public void testSimpleUpdateLD6() throws Exception
@@ -2416,24 +2394,9 @@ public class AVMServiceLocalTest extends TestCase
} }
public void testLayeredFolder4() throws Exception public void testLayeredFolder4() throws Exception
{ {
Logger lg1 = null;
Level l1 = null;
Logger lg2 = null;
Level l2 = null;
try try
{ {
// TEMP
lg1 = Logger.getLogger("org.alfresco.repo.avm.AVMServiceLocalTest");
l1 = lg1.getLevel();
lg1.setLevel(Level.DEBUG);
lg2 = Logger.getLogger("org.alfresco.repo.avm.OrphanReaper");
l2 = lg2.getLevel();
lg2.setLevel(Level.DEBUG);
logger.debug("start: testLayeredFolder4"); logger.debug("start: testLayeredFolder4");
fService.createStore("mainA"); fService.createStore("mainA");
@@ -2592,10 +2555,7 @@ public class AVMServiceLocalTest extends TestCase
fService.purgeStore("mainA"); fService.purgeStore("mainA");
fService.purgeStore("mainB"); fService.purgeStore("mainB");
fService.purgeStore("mainB--layer"); fService.purgeStore("mainB--layer");
if (fService.getStore("mainB--workflow1") != null) { fService.purgeStore("mainB--workflow1"); } if (fService.getStore("mainB--workflow1") != null) { fService.purgeStore("mainB--workflow1"); }
lg1.setLevel(l1);
lg2.setLevel(l2);
} }
} }