Changeset 9227 in josm for trunk/src/oauth/signpost/AbstractOAuthProvider.java

Timestamp:

2015-12-31T03:24:56+01:00 (9 years ago)

Author:

Don-vip

Message:

OAuth: add robustness, basic unit test, code cleanup

File:

• trunk/src/oauth/signpost/AbstractOAuthProvider.java (modified) (10 diffs)

trunk/src/oauth/signpost/AbstractOAuthProvider.java

@@ -12 +12 @@
 
 import java.io.BufferedReader;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.HashMap;
@@ -28 +29 @@
  * you will probably inherit from this class, since it takes a lot of work from
  * you.
- * 
+ *
  * @author Matthias Kaeppler
  */
@@ -128 +129 @@
      * </ul>
      * </p>
-     * 
+     *
      * @param consumer
      *        the {@link OAuthConsumer} that should be used to sign the request
@@ -168 +169 @@
                 consumer.setAdditionalParameters(customOAuthParams);
             }
-            
+
             if (this.listener != null) {
                 this.listener.prepareRequest(request);
@@ -174 +175 @@
 
             consumer.sign(request);
-            
+
             if (this.listener != null) {
                 this.listener.prepareSubmission(request);
@@ -230 +231 @@
             return;
         }
-        BufferedReader reader = new BufferedReader(new InputStreamReader(response.getContent()));
         StringBuilder responseBody = new StringBuilder();
-
-        String line = reader.readLine();
-        while (line != null) {
-            responseBody.append(line);
-            line = reader.readLine();
+        InputStream content = response.getContent();
+        if (content != null) {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(content));
+
+            String line = reader.readLine();
+            while (line != null) {
+                responseBody.append(line);
+                line = reader.readLine();
+            }
         }
 
@@ -251 +255 @@
      * Overrride this method if you want to customize the logic for building a
      * request object for the given endpoint URL.
-     * 
+     *
      * @param endpointUrl
      *        the URL to which the request will go
@@ -263 +267 @@
      * Override this method if you want to customize the logic for how the given
      * request is sent to the server.
-     * 
+     *
      * @param request
      *        the request to send
@@ -275 +279 @@
      * Called when the connection is being finalized after receiving the
      * response. Use this to do any cleanup / resource freeing.
-     * 
+     *
      * @param request
      *        the request that has been sent
@@ -295 +299 @@
      * token reply. You must call {@link #setResponseParameters} with the set of
      * parameters before using this method.
-     * 
+     *
      * @param key
      *        the parameter name