From db7afc66b66f6ca055d0fcb6108b00d7e6207354 Mon Sep 17 00:00:00 2001 From: srowen Date: Sun, 7 Oct 2012 11:16:08 +0000 Subject: [PATCH] Work around Android NPE observed in the wild git-svn-id: https://zxing.googlecode.com/svn/trunk@2451 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../com/google/zxing/client/android/HttpHelper.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/android/src/com/google/zxing/client/android/HttpHelper.java b/android/src/com/google/zxing/client/android/HttpHelper.java index 5395969a4..d23cb59c8 100644 --- a/android/src/com/google/zxing/client/android/HttpHelper.java +++ b/android/src/com/google/zxing/client/android/HttpHelper.java @@ -110,8 +110,16 @@ public final class HttpHelper { Log.w(TAG, "Bad URI? " + uri); throw new IOException(iae); } - if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) { - throw new IOException("Bad HTTP response: " + connection.getResponseCode()); + int responseCode; + try { + responseCode = connection.getResponseCode(); + } catch (NullPointerException npe) { + // this is maybe this Android bug: http://code.google.com/p/android/issues/detail?id=15554 + Log.w(TAG, "Bad URI? " + uri); + throw new IOException(npe); + } + if (responseCode != HttpURLConnection.HTTP_OK) { + throw new IOException("Bad HTTP response: " + responseCode); } Log.i(TAG, "Consuming " + uri); return consume(connection, maxChars);