X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fyaz-pdu-assoc-thread.cpp;h=673af8da1f4ab1a395efc57d798f58aa37423c96;hb=711105a336b155f2b7f098cf84f2e30952cb8588;hp=5957ac4b072bb9c0cfe89e3e2e58dae43560fb02;hpb=6a6fabffa5a8a8154a7076eaf653bfb81fd7142c;p=yazpp-moved-to-github.git diff --git a/src/yaz-pdu-assoc-thread.cpp b/src/yaz-pdu-assoc-thread.cpp index 5957ac4..673af8d 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-2012 Index Data and Mike Taylor * See the file LICENSE for details. - * - * $Id: yaz-pdu-assoc-thread.cpp,v 1.15 2006-03-30 11:58:00 adam Exp $ */ +#if HAVE_CONFIG_H +#include +#endif #ifdef WIN32 #define USE_THREADS 1 #endif @@ -46,7 +47,7 @@ PDU_AssocThread::PDU_AssocThread( ISocketObservable *socketObservable) : PDU_Assoc(socketObservable) { - + } void worker::run() @@ -63,7 +64,7 @@ void worker::run() void __cdecl #else void * -#endif +#endif events(void *p) { worker *w = (worker *) p; @@ -82,10 +83,10 @@ void PDU_AssocThread::childNotify(COMSTACK cs) /// Clone PDU Observer new_observable->m_PDU_Observer = m_PDU_Observer->sessionNotify(new_observable, cs_fileno(cs)); - + if (!new_observable->m_PDU_Observer) { - new_observable->close(); + new_observable->shutdown(); delete new_observable; delete socket_observable; return; @@ -117,6 +118,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