From 7956329a4b3b4cd1f9cb2d1b7918eb3a37be4b77 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 25 Jun 2014 15:43:31 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud) 72923: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 72734: Merged DEV to V4.2-BUG-FIX MNT-11198 : NPE exception is thrown on second sync to cloud attempt when log4j.logger.org.alfresco.repo.remoteconnector.RemoteConnectorServiceImpl=DEBUG is in place Was added a null and a type check. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../remoteconnector/RemoteConnectorServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java b/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java index 85c1d68585..1e142c9579 100644 --- a/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java +++ b/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java @@ -182,13 +182,17 @@ public class RemoteConnectorServiceImpl implements RemoteConnectorService { logger.debug("Header: " + hdr ); } - Object requestBody = request.getRequestBody(); - if (requestBody instanceof StringRequestEntity) + Object requestBody = null; + if (request != null) + { + requestBody = request.getRequestBody(); + } + if (requestBody != null && requestBody instanceof StringRequestEntity) { StringRequestEntity re = (StringRequestEntity)request.getRequestBody(); logger.debug("Payload (string): " + re.getContent()); } - else if (requestBody instanceof ByteArrayRequestEntity) + else if (requestBody != null && requestBody instanceof ByteArrayRequestEntity) { ByteArrayRequestEntity re = (ByteArrayRequestEntity)request.getRequestBody(); logger.debug("Payload (byte array): " + re.getContent().toString());