--- a/searchengine/cpix/cpix/src/qrytypes/addressqrytype.cpp Mon May 03 13:33:22 2010 +0300
+++ b/searchengine/cpix/cpix/src/qrytypes/addressqrytype.cpp Fri May 14 16:57:37 2010 +0300
@@ -199,6 +199,7 @@
else
{
idxSearcher->err_ = result.err_;
+ cpix_Hits_destroy(sorted);
}
}
catch (...)
@@ -329,19 +330,17 @@
{
moveErrorCode(idxSearcher_,
qp);
- }
-
- cpix_QueryParser_destroy(qp);
+ }
+
}
else
{
moveErrorCode(idxSearcher_,
&result);
}
-
- cpix_BoostMap_destroy(boosts);
+ cpix_QueryParser_destroy(qp);
}
-
+ cpix_BoostMap_destroy(boosts);
return rv;
}
@@ -378,16 +377,14 @@
{
moveErrorCode(idxSearcher_,
qp);
- }
-
- cpix_QueryParser_destroy(qp);
+ }
}
else
{
moveErrorCode(idxSearcher_,
&result);
}
-
+ cpix_QueryParser_destroy(qp);
return rv;
}