From f1583306ca4daf0e318fa32c126dd5e9512d569c Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Thu, 4 Sep 2014 06:51:12 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 82376: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 76481: Removed content downloaded event, its now part of the activity stream git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/scripts/content/ContentStreamer.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java b/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java index 355114ae83..a496713981 100644 --- a/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java +++ b/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java @@ -354,21 +354,21 @@ public class ContentStreamer implements ResourceLoaderAware final long size = reader.getSize(); final String encoding = reader.getEncoding(); - if (attach) - { - final String finalMimetype = mimetype; - - eventPublisher.publishEvent(new EventPreparator(){ - @Override - public Event prepareEvent(String user, String networkId, String transactionId) - { - String siteId = siteService.getSiteShortName(nodeRef); - - return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId, - nodeRef.getId(), siteId, propertyQName.toString(), Client.asType(ClientType.webclient), attachFileName, finalMimetype, size, encoding); - } - }); - } +// if (attach) +// { +// final String finalMimetype = mimetype; +// +// eventPublisher.publishEvent(new EventPreparator(){ +// @Override +// public Event prepareEvent(String user, String networkId, String transactionId) +// { +// String siteId = siteService.getSiteShortName(nodeRef); +// +// return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId, +// nodeRef.getId(), siteId, propertyQName.toString(), Client.asType(ClientType.webclient), attachFileName, finalMimetype, size, encoding); +// } +// }); +// } if (range == null) {