diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1996-11-28 07:14:18 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1996-11-28 07:14:18 +0000 |
| commit | ad66c757e62495734e28c3f3bbc33a9fd29217d3 (patch) | |
| tree | b679cecc050588c642722e7dffd780ed81a442eb /ace/Stream.cpp | |
| parent | d395a38d42932c86ebef82468f58c03b3529363e (diff) | |
| download | ATCD-ad66c757e62495734e28c3f3bbc33a9fd29217d3.tar.gz | |
yow
Diffstat (limited to 'ace/Stream.cpp')
| -rw-r--r-- | ace/Stream.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ace/Stream.cpp b/ace/Stream.cpp index 7b120ef43f3..5780ecbc6c4 100644 --- a/ace/Stream.cpp +++ b/ace/Stream.cpp @@ -236,8 +236,9 @@ ACE_Stream<ACE_SYNCH_2>::open (void *a, { ACE_TRACE ("ACE_Stream<ACE_SYNCH_2>::open"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); - ACE_Task<ACE_SYNCH_2> *h1, *h2; - ACE_Task<ACE_SYNCH_2> *t1, *t2; + + ACE_Task<ACE_SYNCH_2> *h1 = 0, *h2 = 0; + ACE_Task<ACE_SYNCH_2> *t1 = 0, *t2 = 0; if (head == 0) { @@ -255,8 +256,8 @@ ACE_Stream<ACE_SYNCH_2>::open (void *a, } // Make sure *all* the allocation succeeded! - if (h1 == 0 || h2 == 0 || head == 0 - || t1 == 0 || t2 == 0 || tail == 0) + if (head == 0 && (h1 == 0 || h2 == 0) + || tail == 0 && (t1 == 0 || t2 == 0)) { delete h1; delete h2; |