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

Merged BRANCHES\DEV\MODEL_SPLIT to HEAD

Browse Source 
Split the data dictionary out from the repository.
    There is a new DataModel project to add into eclipse
    Still to move a few context dependent tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2010-06-30 14:17:18 +00:00
parent 3238ca154a
commit 1e19360747
172 changed files with 170 additions and 30303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/content/ContentServiceImpl.java
View File

@@ -48,7 +48,6 @@ import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentIOException;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentStreamListener;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NoTransformerException;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -467,8 +466,9 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
{
// need a listener to update the node when the stream closes
WriteStreamListener listener = new WriteStreamListener(nodeService, nodeRef, propertyQName, writer);
listener.setRetryingTransactionHelper(transactionHelper);
writer.addListener(listener);
writer.setRetryingTransactionHelper(transactionHelper);
}
// give back to the client
@@ -596,12 +596,10 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
* Ensures that, upon closure of the output stream, the node is updated with
* the latest URL of the content to which it refers.
* <p>
* The listener close operation does not need a transaction as the
* <code>ContentWriter</code> takes care of that.
*
* @author Derek Hulley
*/
private static class WriteStreamListener implements ContentStreamListener
private static class WriteStreamListener extends AbstractContentStreamListener
{
private NodeService nodeService;
private NodeRef nodeRef;
@@ -620,7 +618,7 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
this.writer = writer;
}
public void contentStreamClosed() throws ContentIOException
public void contentStreamClosedImpl() throws ContentIOException
{
try
{