mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
43598: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX *RECORD ONLY* 41906: ALF-11378: REST API has been modified to return extra information about a user whether s/he belongs to a group or not. 44003: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to BRANCHES/DEV/V4.1-BUG-FIX: ALF-15210: Inconsistency in the '?' icon over the dashlets projects\slingshot\source\web\js\share.js DashletTitleBarActions_onReady() function was updated. Fix initialize the style for actionsNode elements into the DOM for IE. 44004: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to V4.1-BUG-FIX: ALF-15793: edit offline hides version history projects\slingshot\source\web\components\document-details\document-actions.js onActionUploadNewVersion function was updated. Fix sets version variable correctly now using asset.workingCopy property instead asset.custom property, which is undefined. 44018: ALF-16540 : CMIS: createDocument with VersioningState.CHECKEDOUT causes NodeLockedException for types with mandatory versionable aspect The ckeck for lock was disabled when beforeCreateVersion policy is handled. Version could be created for a locked node. 44054: Fix for ALF-16337. Datalist assignee not searchable by full name. 44056: Trivial change. Fixing some compiler warnings under org.alfresco.repo.content.metadata including a noisy Tika one. 44143: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_19 to BRANCHES/DEV/V4.1-BUG-FIX: 42989: ALF-16331: Wrong user for "completed by" information provided in Group Review And Approve workflow 44147: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX: 44146: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2012_05_22 to BRANCHES/DEV/V3.4-BUG-FIX: 37733: ALF-12051: Webdav - Cannot open files containing "?" character in the filename in WinXP 44152: ALF-17009 : Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3) 44151: ALF-14035 Tiny HTML file that causes Jodconverter to launch a 100% CPU soffice instance - HTML to PDF is now done via ODT as the direct transform hangs if there are <sub> tags in the HTML. - Added in 'unsupportedTransformations' to stop a bare transformer.JodConverter from doing HTML to PDF - TransformerDebug test file debugTransformers.txt no longer needs to be 18 bytes, as it made it too fiddly. - Modified debug from RuntimeExec so less editing is required to running from the command line - Removed tabs that had been added to enterprise/content-services-context.xml in 4.1-BUG-FIX 44192: ALF-16560 - CIFS: Word document version history lost after saving content in Word:mac 2011 on Mac Mountain Lion 44224: ALF-16896 Exception with TIKA meta data extractor. - Patch POI to handle parsing of Unicode properties that starts on a 4 byte boundary rather than the specified offset. Example file was created using http://www.aspose.com/ 44241: Merged DEV to V4.1-BUG-FIX 44208: ALF-14591 : Ordering not supported for IMAP properties defining IMAP sort fields in Share Make properties from imap:imapContent aspect indexable for SOLR. 44253: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/V4.1-BUG-FIX: 38927: CLOUD-128 - Update rules works incorrectly This is a partial fix for ALF-14568. The rest is coming in a separate check-in. I made some minor adjustments to this change - trivial spelling fix and whitespace changes. 44257: ALF-16563 - CIFS: Image document version history lost after saving content in Preview on Mac Mountain Lion 44260: Fix for ALF-16430 - List of values shown in alphabetical order in Share Forms. Values now only sorted if the Forms config 'field' element has the sorted='true' attribute. 44269: Completion of fix for ALF-14568 - Update rule works incorrectly. 44318: Fix for ALF-17055 - remoteadm webscript set a Last-Modified HTTP header whose date format does not conform to RFC 2616 hence breaking proxy caching 44320: Fix for ALF-16463 - documentLibrary RSS feed does not pass the w3c validator, in particular pubDate breaks RFC-822, date not displayed when using non English locale 44352: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_12 to BRANCHES/DEV/V4.1-BUG-FIX 43860: ALF-16263: Search using a "Stop Word" not displaying any result git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44459 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
589 lines
24 KiB
Java
589 lines
24 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.filesys.repo.rules;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
|
|
import org.alfresco.filesys.repo.OpenFileMode;
|
|
import org.alfresco.filesys.repo.ResultCallback;
|
|
import org.alfresco.filesys.repo.TempNetworkFile;
|
|
import org.alfresco.filesys.repo.rules.ScenarioInstance.Ranking;
|
|
import org.alfresco.filesys.repo.rules.ScenarioRenameShuffleInstance.InternalState;
|
|
import org.alfresco.filesys.repo.rules.commands.CallbackCommand;
|
|
import org.alfresco.filesys.repo.rules.commands.CloseFileCommand;
|
|
import org.alfresco.filesys.repo.rules.commands.CompoundCommand;
|
|
import org.alfresco.filesys.repo.rules.commands.CopyContentCommand;
|
|
import org.alfresco.filesys.repo.rules.commands.CreateFileCommand;
|
|
import org.alfresco.filesys.repo.rules.commands.DeleteFileCommand;
|
|
import org.alfresco.filesys.repo.rules.commands.DoNothingCommand;
|
|
import org.alfresco.filesys.repo.rules.commands.OpenFileCommand;
|
|
import org.alfresco.filesys.repo.rules.commands.ReduceQuotaCommand;
|
|
import org.alfresco.filesys.repo.rules.commands.RemoveNoContentFileOnError;
|
|
import org.alfresco.filesys.repo.rules.commands.RemoveTempFileCommand;
|
|
import org.alfresco.filesys.repo.rules.commands.RenameFileCommand;
|
|
import org.alfresco.filesys.repo.rules.commands.ReturnValueCommand;
|
|
import org.alfresco.filesys.repo.rules.operations.CloseFileOperation;
|
|
import org.alfresco.filesys.repo.rules.operations.CreateFileOperation;
|
|
import org.alfresco.filesys.repo.rules.operations.DeleteFileOperation;
|
|
import org.alfresco.filesys.repo.rules.operations.OpenFileOperation;
|
|
import org.alfresco.filesys.repo.rules.operations.RenameFileOperation;
|
|
import org.alfresco.jlan.server.filesys.NetworkFile;
|
|
import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
|
/**
|
|
* An open file scenario is ...
|
|
* <p>
|
|
* 1) open(readOnly)
|
|
* 2) close(readOnly)
|
|
* <p>
|
|
* 1) open(readOnly)
|
|
* 2) open(readWrite)
|
|
* 3) close(readOnly)
|
|
* 4 close(readWrite) updates the repo
|
|
* <p>
|
|
* 1) open(readOnly)
|
|
* 2) open(readWrite)
|
|
* 3) open(readWrite) - does nothing. Increments Open Count.
|
|
* 4) close(readWrite) - does nothing. Decrements Open Count.
|
|
* 5) close(readWrite) - updates the repo.
|
|
* 6) close(readOnly) - closes read only
|
|
* <p>
|
|
* 1) open (readWrite)
|
|
* 2) open (readOnly) - file already open for read/write
|
|
* 3) close
|
|
* 4) close
|
|
*
|
|
*/
|
|
class ScenarioOpenFileInstance implements ScenarioInstance, DependentInstance
|
|
{
|
|
private static Log logger = LogFactory.getLog(ScenarioOpenFileInstance.class);
|
|
|
|
private Date startTime = new Date();
|
|
|
|
private String name;
|
|
|
|
enum InternalState
|
|
{
|
|
NONE,
|
|
OPENING,
|
|
OPEN,
|
|
ERROR
|
|
} ;
|
|
|
|
InternalState state = InternalState.NONE;
|
|
|
|
/**
|
|
* For each read only open file
|
|
*/
|
|
private NetworkFile fileHandleReadOnly;
|
|
private int openReadOnlyCount = 0;
|
|
|
|
/**
|
|
* For each read/write open file
|
|
*/
|
|
private NetworkFile fileHandleReadWrite;
|
|
private int openReadWriteCount = 0;
|
|
|
|
/**
|
|
* Timeout in ms. Default 30 seconds.
|
|
*/
|
|
private long timeout = 30000;
|
|
|
|
private boolean isComplete = false;
|
|
|
|
private Ranking ranking = Ranking.HIGH;
|
|
|
|
/**
|
|
* Evaluate the next operation
|
|
* @param operation
|
|
*/
|
|
public Command evaluate(Operation operation)
|
|
{
|
|
/**
|
|
* Anti-pattern : timeout - this scenario does not timeout
|
|
*/
|
|
// Date now = new Date();
|
|
// if(now.getTime() > startTime.getTime() + getTimeout())
|
|
// {
|
|
// if(logger.isDebugEnabled())
|
|
// {
|
|
// logger.debug("Instance timed out");
|
|
// }
|
|
// }
|
|
|
|
/**
|
|
* Anti Pattern - Delete of the open file.
|
|
*/
|
|
if(operation instanceof DeleteFileOperation)
|
|
{
|
|
DeleteFileOperation d = (DeleteFileOperation)operation;
|
|
|
|
if(d.getName() == null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
if(name.equalsIgnoreCase(d.getName()))
|
|
{
|
|
logger.debug("Anti-Pattern - delete of the open file, scenario:" + this);
|
|
isComplete = true;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
switch (state)
|
|
{
|
|
case NONE:
|
|
if(operation instanceof CreateFileOperation)
|
|
{
|
|
CreateFileOperation c = (CreateFileOperation)operation;
|
|
name = c.getName();
|
|
|
|
if(name != null)
|
|
{
|
|
state = InternalState.OPENING;
|
|
logger.debug("Create File name:" + name);
|
|
ArrayList<Command> commands = new ArrayList<Command>();
|
|
ArrayList<Command> postCommitCommands = new ArrayList<Command>();
|
|
ArrayList<Command> postErrorCommands = new ArrayList<Command>();
|
|
commands.add(new CreateFileCommand(c.getName(), c.getRootNodeRef(), c.getPath(), c.getAllocationSize()));
|
|
postCommitCommands.add(newOpenFileCallbackCommand());
|
|
postErrorCommands.add(newOpenFileErrorCallbackCommand());
|
|
return new CompoundCommand(commands, postCommitCommands, postErrorCommands);
|
|
}
|
|
}
|
|
else if(operation instanceof OpenFileOperation)
|
|
{
|
|
OpenFileOperation o = (OpenFileOperation)operation;
|
|
name = o.getName();
|
|
if(name != null)
|
|
{
|
|
state = InternalState.OPENING;
|
|
logger.debug("Open File name:" + name);
|
|
ArrayList<Command> commands = new ArrayList<Command>();
|
|
commands.add(new OpenFileCommand(o.getName(), o.getMode(), o.isTruncate(), o.getRootNodeRef(), o.getPath()));
|
|
ArrayList<Command> postCommitCommands = new ArrayList<Command>();
|
|
ArrayList<Command> postErrorCommands = new ArrayList<Command>();
|
|
postCommitCommands.add(newOpenFileCallbackCommand());
|
|
postErrorCommands.add(newOpenFileErrorCallbackCommand());
|
|
return new CompoundCommand(commands, postCommitCommands, postErrorCommands);
|
|
}
|
|
}
|
|
|
|
// Scenario Not Started
|
|
logger.debug("Scenario not started - no name");
|
|
isComplete = true;
|
|
return null;
|
|
|
|
case OPENING:
|
|
|
|
if(operation instanceof OpenFileOperation)
|
|
{
|
|
OpenFileOperation o = (OpenFileOperation)operation;
|
|
|
|
if(o.getName() == null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
if(name.equalsIgnoreCase(o.getName()))
|
|
{
|
|
/**
|
|
* TODO What to do here - one thread is in the middle of
|
|
* opening a file while another tries to open the same file
|
|
* sleep for a bit? then check state again? What happens if file
|
|
* closes while sleeping. For now log an error.
|
|
*/
|
|
logger.error("Second open while in opening state. :" + name);
|
|
// isComplete = true;
|
|
// return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Anti-pattern : timeout - is this needed ?
|
|
*/
|
|
Date now = new Date();
|
|
if(now.getTime() > startTime.getTime() + getTimeout())
|
|
{
|
|
if(logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Instance in OPENING STATE timed out name" + name);
|
|
}
|
|
isComplete = true;
|
|
}
|
|
return null;
|
|
|
|
case ERROR:
|
|
|
|
logger.debug("Open has failed :" + name);
|
|
isComplete = true;
|
|
return null;
|
|
|
|
case OPEN:
|
|
|
|
if(operation instanceof CloseFileOperation)
|
|
{
|
|
CloseFileOperation c = (CloseFileOperation)operation;
|
|
|
|
if(c.getName() == null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
if(name.equalsIgnoreCase(c.getName()))
|
|
{
|
|
NetworkFile file = c.getNetworkFile();
|
|
if(isReadOnly(file))
|
|
{
|
|
// Read Only File
|
|
if(openReadOnlyCount == 1 || c.isForce())
|
|
{
|
|
if(logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Close of last read only file handle:" + this);
|
|
}
|
|
|
|
openReadOnlyCount = 0;
|
|
|
|
if(openReadWriteCount <= 0)
|
|
{
|
|
if(logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Scenario is complete:" + this);
|
|
}
|
|
isComplete=true;
|
|
}
|
|
|
|
if (file instanceof TempNetworkFile)
|
|
{
|
|
logger.debug("this is the last close of a temp read only file");
|
|
ArrayList<Command> commands = new ArrayList<Command>();
|
|
ArrayList<Command> postCommitCommands = new ArrayList<Command>();
|
|
|
|
commands.add(new CloseFileCommand(c.getName(), file, c.getRootNodeRef(), c.getPath()));
|
|
postCommitCommands.add(new RemoveTempFileCommand((TempNetworkFile)file));
|
|
return new CompoundCommand(commands, postCommitCommands);
|
|
}
|
|
else
|
|
{
|
|
return new CloseFileCommand(c.getName(), file, c.getRootNodeRef(), c.getPath());
|
|
}
|
|
}
|
|
|
|
if(logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Only decrement count of read only file handle:" + this);
|
|
}
|
|
|
|
openReadOnlyCount--;
|
|
|
|
return new DoNothingCommand();
|
|
}
|
|
else
|
|
{
|
|
// This is a close of a Read Write File
|
|
// Read Only File
|
|
if(openReadWriteCount == 1 || c.isForce())
|
|
{
|
|
if(logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Close of last read write file handle:" + this);
|
|
}
|
|
|
|
openReadWriteCount = 0;
|
|
|
|
if(openReadOnlyCount <= 0)
|
|
{
|
|
if(logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Scenario is complete:" + this);
|
|
}
|
|
isComplete=true;
|
|
}
|
|
|
|
|
|
//
|
|
ArrayList<Command> commands = new ArrayList<Command>();
|
|
ArrayList<Command> postCommitCommands = new ArrayList<Command>();
|
|
ArrayList<Command> postErrorCommands = new ArrayList<Command>();
|
|
|
|
commands.add(new CloseFileCommand(c.getName(), file, c.getRootNodeRef(), c.getPath()));
|
|
|
|
//postErrorCommands.add(new RemoveNoContentFileOnError(c.getName(), c.getRootNodeRef(), c.getPath()));
|
|
|
|
if(c.isDeleteOnClose())
|
|
{
|
|
postCommitCommands.add(new ReduceQuotaCommand(c.getName(), file, c.getRootNodeRef(), c.getPath()));
|
|
}
|
|
|
|
if (file instanceof TempNetworkFile)
|
|
{
|
|
postCommitCommands.add(new RemoveTempFileCommand((TempNetworkFile)file));
|
|
}
|
|
|
|
return new CompoundCommand(commands, postCommitCommands, postErrorCommands);
|
|
|
|
}
|
|
|
|
if(logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Only decrement count of read write file handle:" + this);
|
|
}
|
|
|
|
openReadWriteCount--;
|
|
|
|
return new DoNothingCommand();
|
|
}
|
|
}
|
|
}
|
|
else if(operation instanceof OpenFileOperation)
|
|
{
|
|
OpenFileOperation o = (OpenFileOperation)operation;
|
|
|
|
if(o.getName() == null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
if(name != null && name.equalsIgnoreCase(o.getName()))
|
|
{
|
|
if(o.getMode() == OpenFileMode.READ_WRITE)
|
|
{
|
|
// This is an open of a read write access
|
|
if(openReadWriteCount == 0)
|
|
{
|
|
logger.debug("Open first read/write from scenario:" + this);
|
|
ArrayList<Command> commands = new ArrayList<Command>();
|
|
commands.add(new OpenFileCommand(o.getName(), o.getMode(), o.isTruncate(), o.getRootNodeRef(), o.getPath()));
|
|
ArrayList<Command> postCommitCommands = new ArrayList<Command>();
|
|
postCommitCommands.add(newOpenFileCallbackCommand());
|
|
return new CompoundCommand(commands, postCommitCommands);
|
|
}
|
|
else
|
|
{
|
|
// TODO Need a permission check here and increment post check
|
|
openReadWriteCount++;
|
|
logger.debug("Return already open read/write file handle from scenario:" + this);
|
|
return new ReturnValueCommand(fileHandleReadWrite);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// This is an open for read only access
|
|
|
|
if(openReadWriteCount > 0)
|
|
{
|
|
//however the file is already open for read/write
|
|
openReadWriteCount++;
|
|
logger.debug("Return already open read/write file handle from scenario:" + this);
|
|
return new ReturnValueCommand(fileHandleReadWrite);
|
|
}
|
|
|
|
if(openReadOnlyCount == 0)
|
|
{
|
|
logger.debug("Open first read only from scenario:" + this);
|
|
ArrayList<Command> commands = new ArrayList<Command>();
|
|
commands.add(new OpenFileCommand(o.getName(), o.getMode(), o.isTruncate(), o.getRootNodeRef(), o.getPath()));
|
|
ArrayList<Command> postCommitCommands = new ArrayList<Command>();
|
|
postCommitCommands.add(newOpenFileCallbackCommand());
|
|
return new CompoundCommand(commands, postCommitCommands);
|
|
}
|
|
else
|
|
{
|
|
openReadOnlyCount++;
|
|
logger.debug("Return already open only file handle from scenario:" + this);
|
|
return new ReturnValueCommand(fileHandleReadOnly);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
@Override
|
|
public boolean isComplete()
|
|
{
|
|
return isComplete;
|
|
}
|
|
|
|
public String toString()
|
|
{
|
|
return "ScenarioOpenFileInstance name:" + name;
|
|
}
|
|
|
|
public void setTimeout(long timeout)
|
|
{
|
|
this.timeout = timeout;
|
|
}
|
|
|
|
public long getTimeout()
|
|
{
|
|
return timeout;
|
|
}
|
|
|
|
@Override
|
|
public Ranking getRanking()
|
|
{
|
|
return ranking;
|
|
}
|
|
|
|
public void setRanking(Ranking ranking)
|
|
{
|
|
this.ranking = ranking;
|
|
}
|
|
|
|
public String getName()
|
|
{
|
|
return name;
|
|
}
|
|
|
|
/**
|
|
* Called for open file.
|
|
*/
|
|
private ResultCallback newOpenFileCallbackCommand()
|
|
{
|
|
return new ResultCallback()
|
|
{
|
|
@Override
|
|
public void execute(Object result)
|
|
{
|
|
if(result instanceof NetworkFile)
|
|
{
|
|
|
|
// Now update the state of this scenario - we have an open fileHandle
|
|
NetworkFile fileHandle = (NetworkFile)result;
|
|
|
|
state = InternalState.OPEN;
|
|
|
|
if(isReadOnly(fileHandle))
|
|
{
|
|
openReadOnlyCount++;
|
|
fileHandleReadOnly=fileHandle;
|
|
if(logger.isDebugEnabled())
|
|
{
|
|
logger.debug("file opened read only:" + result + ", name:" + name);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
openReadWriteCount++;
|
|
fileHandleReadWrite=fileHandle;
|
|
|
|
if(logger.isDebugEnabled())
|
|
{
|
|
logger.debug("file opened read write :" + result + ", name:" + name);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public TxnReadState getTransactionRequired()
|
|
{
|
|
return TxnReadState.TXN_NONE;
|
|
}
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Called for open file error.
|
|
*/
|
|
private ResultCallback newOpenFileErrorCallbackCommand()
|
|
{
|
|
return new ResultCallback()
|
|
{
|
|
@Override
|
|
public void execute(Object result)
|
|
{
|
|
logger.debug("error handler - set state to error for name:" + name);
|
|
isComplete = true;
|
|
state = InternalState.ERROR;
|
|
}
|
|
|
|
@Override
|
|
public TxnReadState getTransactionRequired()
|
|
{
|
|
return TxnReadState.TXN_NONE;
|
|
}
|
|
};
|
|
}
|
|
|
|
|
|
private boolean isReadOnly(NetworkFile file)
|
|
{
|
|
return (file.getGrantedAccess() == NetworkFile.READONLY);
|
|
}
|
|
|
|
/* This openFileInstance knows about ScenarioDeleteRestore */
|
|
@Override
|
|
public Command win(List<ScenarioResult> results, Command command)
|
|
{
|
|
if(command instanceof CompoundCommand)
|
|
{
|
|
CompoundCommand c = (CompoundCommand)command;
|
|
for(ScenarioResult looser : results)
|
|
{
|
|
if(looser.scenario instanceof ScenarioDeleteRestoreInstance)
|
|
{
|
|
Command l = looser.command;
|
|
ArrayList<Command> commands = new ArrayList<Command>();
|
|
ArrayList<Command> postCommitCommands = new ArrayList<Command>();
|
|
ArrayList<Command> postErrorCommands = new ArrayList<Command>();
|
|
commands.add(l);
|
|
postCommitCommands.addAll(c.getPostCommitCommands());
|
|
postErrorCommands.addAll(c.getPostErrorCommands());
|
|
|
|
logger.debug("returning merged high priority executor");
|
|
return new CompoundCommand(commands, postCommitCommands, postErrorCommands);
|
|
}
|
|
|
|
|
|
if(looser.scenario instanceof ScenarioDeleteOnCloseRenameInstance)
|
|
{
|
|
CompoundCommand l = (CompoundCommand)looser.command;
|
|
ArrayList<Command> commands = new ArrayList<Command>();
|
|
ArrayList<Command> postCommitCommands = new ArrayList<Command>();
|
|
ArrayList<Command> postErrorCommands = new ArrayList<Command>();
|
|
commands.addAll(c.getCommands());
|
|
postCommitCommands.addAll(c.getPostCommitCommands());
|
|
// Merge in the loosing post commit
|
|
postCommitCommands.addAll(l.getPostCommitCommands());
|
|
postErrorCommands.addAll(c.getPostErrorCommands());
|
|
|
|
logger.debug("returning merged high priority executor");
|
|
return new CompoundCommand(commands, postCommitCommands, postErrorCommands);
|
|
}
|
|
}
|
|
}
|
|
// No change
|
|
return command;
|
|
}
|
|
}
|
|
|