From ac16cb40abcb6ab65b4f0312e76bafe6c3a1c533 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 30 Apr 2014 16:09:58 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    68123:
 Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)       67232:
 MNT-10361: Merged DEV to V4.2-BUG-FIX (4.2.3)          67146: MNT-10361
 Disabling QuickShare throws exception and previewer fails to load            
   - Moved the call to checkEnabled(); from
 QuickShareServiceImpl.getMetaData(NodeRef nodeRef) in
 QuickShareServiceImpl.getMetaData(String shareId).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repo/quickshare/QuickShareServiceImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java b/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java
index dfb38c438f..d13df9c759 100644
--- a/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java
+++ b/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java
@@ -262,7 +262,7 @@ public class QuickShareServiceImpl implements QuickShareService, NodeServicePoli
     @Override
     public Map<String, Object> getMetaData(NodeRef nodeRef)
     {
-        checkEnabled();
+    	// TODO This functionality MUST be available when quickshare is also disabled, therefor refactor it out from the quickshare package to a more common package.
         
         Map<QName, Serializable> nodeProps = nodeService.getProperties(nodeRef);
         ContentData contentData = (ContentData)nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
@@ -379,6 +379,8 @@ public class QuickShareServiceImpl implements QuickShareService, NodeServicePoli
     @Override
     public Map<String, Object> getMetaData(String sharedId)
     {
+    	checkEnabled();
+    	
         Pair<String, NodeRef> pair = getTenantNodeRefFromSharedId(sharedId);
         final String tenantDomain = pair.getFirst();
         final NodeRef nodeRef = pair.getSecond();