From 4b38943bdb92259f0713fd1e246d936eef4ebfb4 Mon Sep 17 00:00:00 2001
From: drizea <danielrizea27@gmail.com>
Date: Mon, 23 Jul 2012 10:16:54 +0300
Subject: [PATCH] fix REAUTH bug when session expire exception was throwned

---
 .../android/accountAccess/AccountAccess.java       |  5 +++--
 .../checkout/ItemsCheckOutListView.java            |  3 +++
 .../src/org/evergreen/android/globals/Utils.java   | 25 ++++++++++++----------
 3 files changed, 20 insertions(+), 13 deletions(-)

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 a9f27ba852..7fbf4f9b11 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
@@ -640,7 +640,9 @@ public class AccountAccess {
 		//fields of interest : expire_time
 		List<OSRFObject> listHoldsAhr = null;
 
-		listHoldsAhr = (List<OSRFObject>) Utils.doRequest(conn, SERVICE_CIRC, METHOD_FETCH_HOLDS, authToken, cm, new Object[]{authToken,userID});
+		Object resp =  Utils.doRequest(conn, SERVICE_CIRC, METHOD_FETCH_HOLDS, authToken, cm, new Object[]{authToken,userID});
+		
+		listHoldsAhr = (List<OSRFObject>) resp;
 		
 		for(int i=0;i<listHoldsAhr.size();i++){
 			//create hold item
@@ -655,7 +657,6 @@ public class AccountAccess {
 		}
 		return holds;
 	}
-	
 	/* hold target type :
 	 *  M - metarecord
 	 *  T - record
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
index 778f9899b3..1acd68ad70 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
@@ -71,6 +71,9 @@ public class ItemsCheckOutListView extends Activity{
 				}catch (SessionNotFoundException e) {
 					//TODO other way?
 					try{
+						
+						Log.d(TAG, "REAUTH " + "in process" );
+						
 						if(accountAccess.authenticate())
 							circRecords = accountAccess.getItemsCheckedOut();
 					}catch(Exception eauth){
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java b/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java
index 751e4c39c8..3e514f8d3c 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java
@@ -255,18 +255,21 @@ public class Utils {
 			System.out.println("Sync Response: " + resp);
 			Object response = (Object) resp;
 			
-				try{
-					String textcode = ((Map<String,String>)response).get("textcode");
-					if(textcode != null){
-						if(textcode.equals("NO_SESSION")){
-							System.out.println("REQUIRE NEW SESSION");
-							throw new SessionNotFoundException();
-						}
-						
-					}
-				}catch(Exception e){
-					System.err.println("Exception in retreive" + e.getMessage());
+			String textcode = null;
+			try{
+				textcode = ((Map<String,String>)response).get("textcode");
+			}catch(Exception e){
+				System.err.println("Exception in retreive" + e.getMessage());
+			}
+				
+			if(textcode != null){
+				if(textcode.equals("NO_SESSION")){
+					//System.out.println("REQUIRE NEW SESSION");
+						throw new SessionNotFoundException();
+			}
+					
 				}
+				
 				return response;
 			
 		}
-- 
2.11.0