From 76cd9bbe1a562c561e1ac35b24c8f1fe508bac93 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 1 Mar 2004 17:01:52 +0000
Subject: [PATCH] Fix pre_init to prevent spawn if it is already queued.
 Version 2.0.15 update.

---
 ChangeLog         |    4 ++++
 configure.in      |    2 +-
 src/yaz-proxy.cpp |    4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1da5e86..e1463c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+--- 0.7.11 2004/03/01 Internal release.
+
+Fix pre_init to prevent spawn if it is already queued.
+
 --- 0.7.10 2004/02/27 Internal release.
 
 Make workaround for FILE handles for libxml2 on Solaris where
diff --git a/configure.in b/configure.in
index cc795f4..c010aa2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE("yaz++",0.7.10)
+AM_INIT_AUTOMAKE("yaz++",0.7.11)
 
 AC_PROG_CC
 AC_PROG_CPP
diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 5528cb1..1caa1ea 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy.cpp,v 1.105 2004-02-27 00:42:58 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.106 2004-03-01 17:01:52 adam Exp $
  */
 
 #include <unistd.h>
@@ -2325,7 +2325,7 @@ void Yaz_Proxy::pre_init()
 			"sparew=%d preinit=%d",m_session_str,
 			name, zurl_in_use[j], in_use, other,
 			spare, spare_waiting, pre_init);
-		if (spare < pre_init)
+		if (spare + spare_waiting < pre_init)
 		{
 		    c = new Yaz_ProxyClient(m_PDU_Observable->clone(), this);
 		    c->m_next = m_clientPool;
-- 
1.7.10.4