Scarab commit: svn commit: r10567 - trunk/src/java/org/tigris/scarab: actions tools xmlrpc

Author: hair
Date: 2008-05-07 07:33:40-0700
New Revision: 10567

Modified:
   trunk/src/java/org/tigris/scarab/actions/ReportIssue.java
   trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
   trunk/src/java/org/tigris/scarab/xmlrpc/SimpleHandler.java

Log:
fix leaking count of open IssueSearch instances.

Modified: trunk/src/java/org/tigris/scarab/actions/ReportIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/ReportIssue.java?view=diff&rev=10567&p1=trunk/src/java/org/tigris/scarab/actions/ReportIssue.java&p2=trunk/src/java/org/tigris/scarab/actions/ReportIssue.java&r1=10566&r2=10567
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/ReportIssue.java	(original)
+++ trunk/src/java/org/tigris/scarab/actions/ReportIssue.java	2008-05-07 07:33:40-0700
@@ -225,9 +225,11 @@
 
         String template = null;
         boolean dupThresholdExceeded = false;
-        IssueSearch duplicateSearch = IssueSearchFactory.INSTANCE.getInstance(issue, (ScarabUser)data.getUser());
+        IssueSearch duplicateSearch = null;
         try 
         {
+            
+            duplicateSearch = IssueSearchFactory.INSTANCE.getInstance(issue, (ScarabUser)data.getUser());
             duplicateSearch.setLocalizationTool(getLocalizationTool(context));
             
             List possibleDuplicates = duplicateSearch.getQueryResults();

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=10567&p1=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&p2=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&r1=10566&r2=10567
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	(original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	2008-05-07 07:33:40-0700
@@ -1753,9 +1753,8 @@
         
         if (!datesValid)
         {
-        	L10NMessage msg = new L10NMessage(L10NKeySet.DateFormatPrompt,L10NKeySet.ShortDateDisplay);
-        	setAlertMessage(msg);
-            IssueSearchFactory.INSTANCE.notifyDone();
+            L10NMessage msg = new L10NMessage(L10NKeySet.DateFormatPrompt,L10NKeySet.ShortDateDisplay);
+            setAlertMessage(msg);
             return null;
         }
         
@@ -1789,8 +1788,10 @@
         }
         
         String sortColumn = data.getParameters().getString("sortColumn");
-        if(isValidIssueSearchSortColumn(sortColumn)) 
+        if(isValidIssueSearchSortColumn(sortColumn))
+        {
             search.setSortAttributeId( Integer.valueOf(sortColumn) );
+        }
         search.setSortInternalAttribute(data.getParameters().getString("sortInternal"));
         search.setSortPolarity(data.getParameters().getString("sortPolarity"));
         
@@ -1819,7 +1820,6 @@
         ScarabUser user = (ScarabUser)data.getUser();
         MITList mitList = user.getCurrentMITList();
         IssueSearch search = IssueSearchFactory.INSTANCE.getInstance(mitList, user);
-        IssueSearchFactory.INSTANCE.notifyDone();       
         return search;
     }
 
@@ -1901,19 +1901,20 @@
     private List getSearchResults(String queryString)
         throws Exception
     {
-        IssueSearch search = getPopulatedSearch(queryString);
+        IssueSearch search = null;
         List queryResults = null;
 
         try
         {
-            	queryResults = search.getQueryResults();
+            search = getPopulatedSearch(queryString);
+            queryResults = search.getQueryResults();
         }
         finally
         {
-        	if(search != null)
-        	{
+            if(search != null)
+            {
                 IssueSearchFactory.INSTANCE.notifyDone();
-        	}
+            }
         }    
         return queryResults;
     }

Modified: trunk/src/java/org/tigris/scarab/xmlrpc/SimpleHandler.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/xmlrpc/SimpleHandler.java?view=diff&rev=10567&p1=trunk/src/java/org/tigris/scarab/xmlrpc/SimpleHandler.java&p2=trunk/src/java/org/tigris/scarab/xmlrpc/SimpleHandler.java&r1=10566&r2=10567
==============================================================================
--- trunk/src/java/org/tigris/scarab/xmlrpc/SimpleHandler.java	(original)
+++ trunk/src/java/org/tigris/scarab/xmlrpc/SimpleHandler.java	2008-05-07 07:33:40-0700
@@ -362,10 +362,10 @@
         }
         finally
         {
-        	if(search != null)
-        	{
+            if(search != null)
+            {
                 IssueSearchFactory.INSTANCE.notifyDone();
-        	}
+            }
         }    
         return matchingIssueIds;
     }