diff options
| author | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-23 18:57:06 +0000 |
|---|---|---|
| committer | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-23 18:57:06 +0000 |
| commit | 2ff437c7a6bdcf3b7bc95f7b543372d9a649fb62 (patch) | |
| tree | faf0e3fa4577401d371b1900b93e75002f073b68 | |
| parent | 33aa522dd55af2fbc817f920b720e499127757d6 (diff) | |
| download | ATCD-2ff437c7a6bdcf3b7bc95f7b543372d9a649fb62.tar.gz | |
Tue Feb 23 18:55:21 UTC 2010 Yan Dai <dai_y@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp | 6 | ||||
| -rw-r--r-- | TAO/tests/Bug_3812_Regression/mock_transport.h | 4 |
3 files changed, 16 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b6162eea89b..4570d408014 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Feb 23 18:55:21 UTC 2010 Yan Dai <dai_y@ociweb.com> + + * bin/tao_orb_tests.lst: + + Added Bug_3812_Regression as not fixed test. + + * tests/Bug_3812_Regression/Bug_3812_Regression.cpp: + * tests/Bug_3812_Regression/mock_transport.h: + + Fixed fuzz errors. + Tue Feb 23 10:35:39 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> * tao/TAO_Internal.cpp: diff --git a/TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp b/TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp index 47f4506343c..e485f7447a6 100644 --- a/TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp +++ b/TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp @@ -22,8 +22,8 @@ static int global_purged_count = 0; static TCM* tcm = 0; static int result = 0; -static ACE_Thread_Mutex test_lock; -static TAO_Condition<ACE_Thread_Mutex> test_condition(test_lock); +static TAO_SYNCH_MUTEX test_lock; +static TAO_Condition<TAO_SYNCH_MUTEX> test_condition(test_lock); static int n_threads = 1; int @@ -76,7 +76,7 @@ class Client_Task : public ACE_Task_Base int svc () { - ACE_Guard<ACE_Thread_Mutex> lock (test_lock); + ACE_Guard<TAO_SYNCH_MUTEX> lock (test_lock); process_listen_point (); test_condition.signal (); return 0; diff --git a/TAO/tests/Bug_3812_Regression/mock_transport.h b/TAO/tests/Bug_3812_Regression/mock_transport.h index 6ea2e7b9b66..5101d883f2b 100644 --- a/TAO/tests/Bug_3812_Regression/mock_transport.h +++ b/TAO/tests/Bug_3812_Regression/mock_transport.h @@ -6,8 +6,8 @@ typedef TAO::Transport_Cache_Manager_T<mock_transport, mock_tdi, mock_ps> TCM; extern TCM* tcm; extern int result; -extern ACE_Thread_Mutex test_lock; -extern TAO_Condition<ACE_Thread_Mutex> test_condition; +extern TAO_SYNCH_MUTEX test_lock; +extern TAO_Condition<TAO_SYNCH_MUTEX> test_condition; class mock_transport |