From b45b923c97947f14148194fff0393b51c5eb8422 Mon Sep 17 00:00:00 2001 From: Britt Park Date: Wed, 20 Jun 2007 22:30:14 +0000 Subject: [PATCH] Fixed failing test in AVMServiceTest. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6045 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../avm/actions/AVMUndoSandboxListAction.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java b/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java index 5af82684d6..ef43d04b1a 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java +++ b/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java @@ -85,19 +85,22 @@ public class AVMUndoSandboxListAction extends ActionExecuterAbstractBase } final Map dnsProperties = fAVMService.queryStorePropertyKey(item.getSecond().split(":")[0], QName.createQName(null, ".dns%")); - String webProject = dnsProperties.keySet().iterator().next().getLocalName(); - webProject = webProject.substring(webProject.lastIndexOf('.') + 1, webProject.length()); - String path = item.getSecond().substring(item.getSecond().indexOf(":") + 1); - if (fgLogger.isDebugEnabled()) - fgLogger.debug("unlocking file " + path + " in web project " + webProject); + if (dnsProperties.size() == 1) + { + String webProject = dnsProperties.keySet().iterator().next().getLocalName(); + webProject = webProject.substring(webProject.lastIndexOf('.') + 1, webProject.length()); + String path = item.getSecond().substring(item.getSecond().indexOf(":") + 1); + if (fgLogger.isDebugEnabled()) + fgLogger.debug("unlocking file " + path + " in web project " + webProject); - if (fAVMLockingService.getLock(webProject, path) != null) - { - fAVMLockingService.removeLock(webProject, path); - } - else - { - fgLogger.warn("expected file " + path + " in " + webProject + " to be locked"); + if (fAVMLockingService.getLock(webProject, path) != null) + { + fAVMLockingService.removeLock(webProject, path); + } + else + { + fgLogger.warn("expected file " + path + " in " + webProject + " to be locked"); + } } } }