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

CLOUD-2214: Mime type is removed during uploading file via WebDav

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58846 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2013-12-11 10:16:54 +00:00
parent 1e5cae38ab
commit b832c812e3
5 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/content/AbstractContentWriter.java
View File

@@ -43,6 +43,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentStreamListener;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.MimetypeServiceAware;
import org.alfresco.util.TempFileProvider;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -58,7 +59,7 @@ import org.springframework.aop.framework.ProxyFactory;
*
* @author Derek Hulley
*/
public abstract class AbstractContentWriter extends AbstractContentAccessor implements ContentWriter
public abstract class AbstractContentWriter extends AbstractContentAccessor implements ContentWriter, MimetypeServiceAware
{
private static final Log logger = LogFactory.getLog(AbstractContentWriter.class);

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

@@ -57,6 +57,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.MimetypeServiceAware;
import org.alfresco.service.cmr.repository.NoTransformerException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
@@ -540,9 +541,9 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
}
// supply the writer with a copy of the mimetype service if needed
if (writer instanceof AbstractContentWriter)
if (writer instanceof MimetypeServiceAware)
{
((AbstractContentWriter)writer).setMimetypeService(mimetypeService);
((MimetypeServiceAware)writer).setMimetypeService(mimetypeService);
}
// give back to the client

9
source/java/org/alfresco/repo/content/caching/BackingStoreAwareCacheWriter.java
View File

@@ -30,6 +30,8 @@ import org.alfresco.service.cmr.repository.ContentIOException;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentStreamListener;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.MimetypeServiceAware;
/**
* Wrapper for cache writer that is aware of backing store
@@ -41,7 +43,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
* @author Viachaslau Tsikhanovich
*
*/
public class BackingStoreAwareCacheWriter implements ContentWriter
public class BackingStoreAwareCacheWriter implements ContentWriter, MimetypeServiceAware
{
/** Cache writer **/
private ContentWriter cacheWriter;
@@ -195,4 +197,9 @@ public class BackingStoreAwareCacheWriter implements ContentWriter
this.cacheWriter.guessEncoding();
}
@Override
public void setMimetypeService(MimetypeService mimetypeService)
{
((MimetypeServiceAware) cacheWriter).setMimetypeService(mimetypeService);
}
}