Scarab commit: svn commit: r10620 - trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java

Author: hair
Date: 2008-08-24 14:53:47-0700
New Revision: 10620

Modified:
   trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java

Log:
Addresses the NPE thrown (stacktrace shown to user) when an issue is viewed within a query list belonging to a session that has expired.
If the "currentQueryString" is null then we know there is an empty queryResult

Modified: trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&rev=10620&p1=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&p2=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&r1=10619&r2=10620
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	(original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	2008-08-24 14:53:47-0700
@@ -1947,7 +1947,10 @@
 
         if (cachedQueryAddition==null || !cachedQueryAddition.equals(currentQueryAddition) || queryResult==null)
         {
-            queryResult = getSearchResults(currentQueryString);
+            // currentQueryString gets lost if the session timed out. an empty search result is returned then.
+            queryResult = null != currentQueryString
+                    ? getSearchResults(currentQueryString)
+                    : Collections.emptyList();
 
             data.getUser().setTemp("queryAddition", currentQueryAddition );
             data.getUser().setTemp("queryResult", queryResult);