diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2003-05-23 20:23:52 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2003-05-23 20:23:52 +0000 |
| commit | 4e71a6b7c929611dd9f4ad091a4813f3d4b05beb (patch) | |
| tree | 9b2573aa1cba3373da91b2c5a2b199ef4f56c858 | |
| parent | 1319908a9fe43ddb4bd87e6cfc7f26ecf6dd7a70 (diff) | |
| download | ATCD-4e71a6b7c929611dd9f4ad091a4813f3d4b05beb.tar.gz | |
ChangeLogTag:Fri May 23 09:13:38 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | ace/OS_Dirent.cpp | 6 |
4 files changed, 13 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 2d4c45f903d..a2ba3a48802 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri May 23 09:13:38 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/OS_Dirent.cpp (opendir_emulation): Added a check to see + if the file is infact a directory. Thanks to Udo Berninger + <udo.berninger@siemens.com> for reporting this fix. + Fri May 23 10:46:50 2003 Ossama Othman <ossama@dre.vanderbilt.edu> From Carsten Madsen <com@navicon.dk> diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5ec4b7da735..f58f780924e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1008,15 +1008,6 @@ Wed May 7 22:49:05 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> Wed May 07 22:32:49 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> -<<<<<<< ChangeLog - * tao/Connection_Handler.cpp (svc_i): Incremented the refcount of - the connection handler before calling the handle_input_i () on - the transport. The pattern should be the same as that in - TAO_Connection_Handler::handle_input_eh (), where the transport - is updated and the refcount on the handler is incremented. This - change should fix problems with servers crashing if remote peers - dissappears under thread-per-connection strategy. -======= * tao/Connection_Handler.cpp (svc_i): Incremented the refcount of the connection handler before calling the handle_input_i () on the transport. The pattern should be the same as that in @@ -1024,7 +1015,6 @@ Wed May 07 22:32:49 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> is updated and the refcount on the handler is incremented. This change should fix problems with servers crashing if remote peers dissappears under thread-per-connection strategy. ->>>>>>> 1.1798 Thanks to Ira Burton <imburton@micron.com> for reporting this problem. @@ -1705,6 +1705,7 @@ Peder Norgaard <pcn@pogt.dk> David Ohlemacher <ohlemacher@bbn.com> Ken Kane <kkane@livevault.com> Bill Church <wchurch@ara.com> +Udo Berninger <udo.berninger@siemens.com> Vincent Korkos <vincent.korkos@fr.thalesgroup.com> I would particularly like to thank Paul Stephenson, who worked with me diff --git a/ace/OS_Dirent.cpp b/ace/OS_Dirent.cpp index 15d12a45f2f..219699283c5 100644 --- a/ace/OS_Dirent.cpp +++ b/ace/OS_Dirent.cpp @@ -19,6 +19,12 @@ ACE_OS_Dirent::opendir_emulation (const ACE_TCHAR *filename) ACE_DIR *dir; ACE_TCHAR extra[3] = {0,0,0}; + // Check if filename is a directory. + DWORD fileAttribute = ::GetFileAttributes (filename); + if (fileAttribute == INVALID_FILE_ATTRIBUTES + || !(fileAttribute & FILE_ATTRIBUTE_DIRECTORY)) + return 0; + /* Note: the semantics of the win32 function FindFirstFile take the basename(filename) as a pattern to be matched within the dirname(filename). |