From: kenstir <kenstir@gmail.com>
Date: Sat, 2 Nov 2013 23:01:21 +0000 (-0400)
Subject: annotating a couple sources of NPEs and fixed one.  Login handling needs to be rewrit... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f161b3a039e3ac101a45be141f7693918e7e9fe5;p=working%2FEvergreen.git

annotating a couple sources of NPEs and fixed one.  Login handling needs to be rewritten.  I'm almost there
---

diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java
index e653a07312..7a05395ee5 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java
@@ -741,6 +741,10 @@ public class AccountAccess {
 
         Object resp = Utils.doRequest(conn, SERVICE_CIRC, METHOD_FETCH_HOLDS,
                 authToken, cm, new Object[] { authToken, userID });
+        if (resp == null) {
+            System.out.println("Result: null");
+            return holds;
+        }
 
         listHoldsAhr = (List<OSRFObject>) resp;
 
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldsListView.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
index ce75475332..0dbffccb12 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
@@ -164,6 +164,7 @@ public class HoldsListView extends Activity {
             }
         };
 
+        // 1 NPE
         if (accountAccess.isAuthenticated()) {
             progressDialog = new ProgressDialog(context);
             progressDialog.setMessage("Loading holds");