X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_thread_pool_observer.cpp;h=10ea2adb5d69adbc556b3a4a52ba3c9537465f27;hb=996d76cbfa4911196ccd9fcd211c23b2c251133a;hp=799a8d1207bb6d1418fa6f5966c990d6d92f7960;hpb=53fa483f7ee74290fa3a34530a9826160c1a8a4c;p=metaproxy-moved-to-github.git

diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp
index 799a8d1..10ea2ad 100644
--- a/src/test_thread_pool_observer.cpp
+++ b/src/test_thread_pool_observer.cpp
@@ -1,25 +1,20 @@
-/* $Id: test_thread_pool_observer.cpp,v 1.10 2006-03-29 13:44:45 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: test_thread_pool_observer.cpp,v 1.14 2007-05-09 21:23:09 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
- */
-/* $Id: test_thread_pool_observer.cpp,v 1.10 2006-03-29 13:44:45 adam Exp $
-   Copyright (c) 1998-2005-2006, Index Data.
-
-This file is part of the yaz-proxy.
+This file is part of Metaproxy.
 
-YAZ proxy is free software; you can redistribute it and/or modify it under
+Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2, or (at your option) any later
 version.
 
-YAZ proxy is distributed in the hope that it will be useful, but WITHOUT ANY
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with YAZ proxy; see the file LICENSE.  If not, write to the
+along with Metaproxy; see the file LICENSE.  If not, write to the
 Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
  */
@@ -102,6 +97,14 @@ void My_Timer_Thread::socketNotify(int event)
     m->m_val = m_requests++;
     m->m_timer = this;
     m_t->put(m);
+#if 0
+    // prevent input queue from being filled up..
+    // bug #1064: Test test_thread_pool_observer hangs
+    // fortunately we don't need this hack. because put (ebove)
+    // will block itself if needed
+    if (m->m_val == 30)
+         m_obs->deleteObserver(this);
+#endif
 }
 
 BOOST_AUTO_UNIT_TEST( thread_pool_observer1 ) 
@@ -113,7 +116,7 @@ BOOST_AUTO_UNIT_TEST( thread_pool_observer1 )
     while (t.m_responses < 30 && mySocketManager.processEvent() > 0)
         ;
     BOOST_CHECK_EQUAL(t.m_responses, 30);
-    BOOST_CHECK(t.m_sum >= 435);
+    BOOST_CHECK(t.m_sum >= 435); // = 29*30/2
 }
 
 /*