Fix NPE when copying error message data to the response

Author: wabson

share-oauth/src/main/java/org/sharextras/webscripts/connector/HttpOAuth2Connector.java

@@ -341,22 +341,37 @@ private void copyResponseContent(Response resp, FakeHttpServletResponse source,
     {
         byte[] bytes = source.getContentAsByteArray();
         source.flushBuffer();
-        if (logger.isDebugEnabled())
+        if (resp != null)
         {
-            logger.debug("Setting status " + resp.getStatus().getCode());
-            logger.debug("Setting encoding " + source.getCharacterEncoding());
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Setting status " + resp.getStatus().getCode());
+                logger.debug("Setting encoding " + source.getCharacterEncoding());
+            }
+            dest.setStatus(resp.getStatus().getCode());
+            // Copy headers over
+            for (Map.Entry<String, String> header : resp.getStatus().getHeaders().entrySet())
+            {
+                dest.setHeader(header.getKey(), header.getValue());
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Add header " + header.getKey() + ": " + header.getValue());
+                }
+            }
         }
-        dest.setStatus(resp.getStatus().getCode());
-        dest.setCharacterEncoding(source.getCharacterEncoding());
-        // Copy headers over
-        for (Map.Entry<String, String> header : resp.getStatus().getHeaders().entrySet())
+        else // Error info is on the fake response
         {
-            dest.setHeader(header.getKey(), header.getValue());
-            if (logger.isDebugEnabled())
+            dest.setStatus(source.getStatus());
+            for (Object hdr : source.getHeaderNames())
             {
-                logger.debug("Add header " + header.getKey() + ": " + header.getValue());
+                dest.setHeader((String) hdr, (String) source.getHeader((String) hdr));
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Add header " + (String) hdr + ": " + (String) source.getHeader((String) hdr));
+                }
             }
         }
+        dest.setCharacterEncoding(source.getCharacterEncoding());
         if (logger.isDebugEnabled())
         {
             logger.debug("Add bytes " + bytes.length);