inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for ALF-3733 (Rendition API - destination-path-template fails to create association)

Browse Source 
The fix was primarily to ensure that templated paths with elements that resolved to empty strings, did not lead to the creation of illegal paths in the FileFolderService. An example would be //foo/bar.
  Added a Java test case that reproduced the issue.
  Added a JavaScript test case that partially reproduced the issue.
  Also needed to add extract method in ScriptAction to allow some internal code to be called by subclasses. This had the serendipitous benefit of reducing repeated code. This was a secondary issue whereby parameters set in the renditionDefinition were not being correctly passed from the Script layer to the Java layer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22099 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2010-08-31 16:44:11 +00:00
parent d0fa96a05e
commit 8de08f878f
6 changed files with 100 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
source/java/org/alfresco/repo/jscript/ScriptAction.java
View File

@@ -132,19 +132,7 @@ public class ScriptAction implements Serializable, Scopeable
@SuppressWarnings("synthetic-access")
public void execute(ScriptNode node)
{
if (this.parameters != null && this.parameters.isModified())
{
Map<String, Serializable> actionParams = action.getParameterValues();
actionParams.clear();
for (Map.Entry<String, Serializable> entry : this.parameters.entrySet())
{
// perform the conversion from script wrapper object to repo serializable values
String name = entry.getKey();
Serializable value = converter.convertActionParamForRepo(name, entry.getValue());
actionParams.put(name, value);
}
}
performParamConversionForRepo();
executeImpl(node);
// Parameters may have been updated by action execution, so reset cache
@@ -172,19 +160,7 @@ public class ScriptAction implements Serializable, Scopeable
@SuppressWarnings("synthetic-access")
public void execute(final ScriptNode node, boolean readOnly, boolean newTxn)
{
if (this.parameters != null && this.parameters.isModified())
{
Map<String, Serializable> actionParams = action.getParameterValues();
actionParams.clear();
for (Map.Entry<String, Serializable> entry : this.parameters.entrySet())
{
// perform the conversion from script wrapper object to repo serializable values
String name = entry.getKey();
Serializable value = converter.convertActionParamForRepo(name, entry.getValue());
actionParams.put(name, value);
}
}
performParamConversionForRepo();
RetryingTransactionCallback<Object> executionActionCallback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
@@ -204,7 +180,7 @@ public class ScriptAction implements Serializable, Scopeable
// Reset the actioned upon node
node.reset();
}
/**
* Execute action. The existing transaction will be joined.
*
@@ -214,19 +190,7 @@ public class ScriptAction implements Serializable, Scopeable
@SuppressWarnings("synthetic-access")
public void execute(NodeRef nodeRef)
{
if (this.parameters != null && this.parameters.isModified())
{
Map<String, Serializable> actionParams = action.getParameterValues();
actionParams.clear();
for (Map.Entry<String, Serializable> entry : this.parameters.entrySet())
{
// perform the conversion from script wrapper object to repo serializable values
String name = entry.getKey();
Serializable value = converter.convertActionParamForRepo(name, entry.getValue());
actionParams.put(name, value);
}
}
performParamConversionForRepo();
actionService.executeAction(action, nodeRef);
// Parameters may have been updated by action execution, so reset cache
@@ -246,19 +210,7 @@ public class ScriptAction implements Serializable, Scopeable
@SuppressWarnings("synthetic-access")
public void execute(final NodeRef nodeRef, boolean readOnly, boolean newTxn)
{
if (this.parameters != null && this.parameters.isModified())
{
Map<String, Serializable> actionParams = action.getParameterValues();
actionParams.clear();
for (Map.Entry<String, Serializable> entry : this.parameters.entrySet())
{
// perform the conversion from script wrapper object to repo serializable values
String name = entry.getKey();
Serializable value = converter.convertActionParamForRepo(name, entry.getValue());
actionParams.put(name, value);
}
}
performParamConversionForRepo();
RetryingTransactionCallback<Object> executionActionCallback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
@@ -275,6 +227,23 @@ public class ScriptAction implements Serializable, Scopeable
// Parameters may have been updated by action execution, so reset cache
this.parameters = null;
}
protected void performParamConversionForRepo() {
if (this.parameters != null && this.parameters.isModified())
{
Map<String, Serializable> actionParams = action.getParameterValues();
actionParams.clear();
for (Map.Entry<String, Serializable> entry : this.parameters.entrySet())
{
// perform the conversion from script wrapper object to repo serializable values
String name = entry.getKey();
Serializable value = converter.convertActionParamForRepo(name, entry.getValue());
actionParams.put(name, value);
}
}
}
/**
* Value converter with specific knowledge of action parameters