X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-pdu-assoc-thread.cpp;h=9eac713be0f79686c615b6266b95f01ca39d673a;hb=059d1ebe37f4c1ab1496d8c68db5ac35d9047c7a;hp=23b930805cdd1f183c0c20c4a6b312190afa9f60;hpb=594ba02c8c039a6570451da08e3461f22a7d0d11;p=yazpp-moved-to-github.git

diff --git a/src/yaz-pdu-assoc-thread.cpp b/src/yaz-pdu-assoc-thread.cpp
index 23b9308..9eac713 100644
--- a/src/yaz-pdu-assoc-thread.cpp
+++ b/src/yaz-pdu-assoc-thread.cpp
@@ -1,10 +1,11 @@
-/*
- * Copyright (c) 1998-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2013 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-pdu-assoc-thread.cpp,v 1.13 2005-10-10 15:59:43 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef WIN32
 #define USE_THREADS 1
 #endif
@@ -30,8 +31,8 @@
 #include <yaz/log.h>
 #include <yaz/tcpip.h>
 
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
 
 using namespace yazpp_1;
 
@@ -46,7 +47,12 @@ PDU_AssocThread::PDU_AssocThread(
     ISocketObservable *socketObservable)
     : PDU_Assoc(socketObservable)
 {
-    
+
+}
+
+PDU_AssocThread::~PDU_AssocThread()
+{
+
 }
 
 void worker::run()
@@ -63,7 +69,7 @@ void worker::run()
 void __cdecl
 #else
 void *
-#endif 
+#endif
 events(void *p)
 {
     worker *w = (worker *) p;
@@ -83,6 +89,14 @@ void PDU_AssocThread::childNotify(COMSTACK cs)
     new_observable->m_PDU_Observer =
         m_PDU_Observer->sessionNotify(new_observable, cs_fileno(cs));
 
+    if (!new_observable->m_PDU_Observer)
+    {
+        new_observable->shutdown();
+        delete new_observable;
+        delete socket_observable;
+        return;
+    }
+
     worker *w = new worker;
     w->m_assoc = new_observable;
     w->m_mgr = socket_observable;
@@ -109,6 +123,7 @@ void PDU_AssocThread::childNotify(COMSTACK cs)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab