From c2c57afa4ad999201c82630771eeafae76c047b0 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Wed, 30 Apr 2014 16:06:43 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 68110: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 65912: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2) 65770: Merged DEV to V4.1-BUG-FIX (4.1.9) 63441: MNT-10334 : Unable to Sync To Cloud in 4.1.7 only Fixed debug logging info for RemoteConnectorServiceImpl class. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68398 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../RemoteConnectorServiceImpl.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java b/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java index 9d111504c4..85c1d68585 100644 --- a/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java +++ b/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2012 Alfresco Software Limited. + * Copyright (C) 2005-2014 Alfresco Software Limited. * * This file is part of Alfresco * @@ -39,6 +39,7 @@ import org.apache.commons.httpclient.HttpMethodBase; import org.apache.commons.httpclient.ProxyHost; import org.apache.commons.httpclient.UsernamePasswordCredentials; import org.apache.commons.httpclient.auth.AuthScope; +import org.apache.commons.httpclient.methods.ByteArrayRequestEntity; import org.apache.commons.httpclient.methods.EntityEnclosingMethod; import org.apache.commons.httpclient.methods.StringRequestEntity; import org.apache.commons.lang.StringUtils; @@ -181,8 +182,21 @@ public class RemoteConnectorServiceImpl implements RemoteConnectorService { logger.debug("Header: " + hdr ); } - StringRequestEntity re = (StringRequestEntity)request.getRequestBody(); - logger.debug("Payload: " + re.getContent()); + Object requestBody = request.getRequestBody(); + if (requestBody instanceof StringRequestEntity) + { + StringRequestEntity re = (StringRequestEntity)request.getRequestBody(); + logger.debug("Payload (string): " + re.getContent()); + } + else if (requestBody instanceof ByteArrayRequestEntity) + { + ByteArrayRequestEntity re = (ByteArrayRequestEntity)request.getRequestBody(); + logger.debug("Payload (byte array): " + re.getContent().toString()); + } + else + { + logger.debug("Payload is not of a readable type."); + } } // Perform the request, and wrap the response