Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
	test/test_http_49.res

Restore to new test result.

diff --git a/src/client.c b/src/client.c
index 064754a..318f645 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -655,8 +655,11 @@ int client_destroy(struct client *c)
             xfree(c->cqlquery);
             c->cqlquery = 0;
             assert(!c->connection);
-            assert(!c->resultset);
-            
+
+            if (c->resultset)
+            {
+                ZOOM_resultset_destroy(c->resultset);
+            }
             yaz_mutex_destroy(&c->mutex);
             xfree(c);
             client_use(-1);
@@ -668,11 +671,6 @@ int client_destroy(struct client *c)
 
 void client_set_connection(struct client *cl, struct connection *con)
 {
-    if (cl->resultset)
-    {
-        ZOOM_resultset_destroy(cl->resultset);
-        cl->resultset = 0;
-    }
     if (con)
     {
         assert(cl->connection == 0);

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 28e81aa..0dadcb1 100755 (executable)
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -78,6 +78,9 @@ for f in `cat ${srcdir}/${URLS}`; do
        OUT2=${PREFIX}_${testno}.log
        DIFF=${PREFIX}_${testno}.dif
        rm -f $OUT2 $DIFF
+       if [ -n "$DEBUG" ] ; then 
+           echo "test $testno: $f" 
+       fi
        if test -n "${postfile}"; then
            eval $POST
        else
@@ -102,6 +105,9 @@ for f in `cat ${srcdir}/${URLS}`; do
        testno=`expr $testno + 1`
        postfile=
     elif echo $f | grep '^[0-9]' >/dev/null; then
+       if [ -n "$DEBUG" ] ; then 
+           echo "Sleeping $f"
+       fi
        sleep $f
     else
        if test -f $srcdir/$f; then