From 839d522808cdcded1e1757e7a3f99d4c15488395 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Thu, 7 Oct 2010 10:27:53 +0000 Subject: [PATCH] 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 --- .../repo/avm/AVMServiceLocalTest.java | 44 +------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java index 302d1b1eaa..5a94e28ef8 100644 --- a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java +++ b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java @@ -50,8 +50,6 @@ import org.alfresco.util.NameMatcher; import org.alfresco.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.springframework.context.ApplicationContext; /** @@ -499,23 +497,8 @@ public class AVMServiceLocalTest extends TestCase public void testSimpleUpdateLD5() throws Exception { - Logger lg1 = null; - Level l1 = null; - - Logger lg2 = null; - Level l2 = null; - 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("created 2 stores: main, layer"); @@ -643,11 +626,6 @@ public class AVMServiceLocalTest extends TestCase e.printStackTrace(System.err); throw e; } - finally - { - lg1.setLevel(l1); - lg2.setLevel(l2); - } } public void testSimpleUpdateLD6() throws Exception @@ -2416,24 +2394,9 @@ public class AVMServiceLocalTest extends TestCase } public void testLayeredFolder4() throws Exception - { - Logger lg1 = null; - Level l1 = null; - - Logger lg2 = null; - Level l2 = null; - + { 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"); fService.createStore("mainA"); @@ -2592,10 +2555,7 @@ public class AVMServiceLocalTest extends TestCase fService.purgeStore("mainA"); fService.purgeStore("mainB"); fService.purgeStore("mainB--layer"); - if (fService.getStore("mainB--workflow1") != null) { fService.purgeStore("mainB--workflow1"); } - - lg1.setLevel(l1); - lg2.setLevel(l2); + if (fService.getStore("mainB--workflow1") != null) { fService.purgeStore("mainB--workflow1"); } } }