summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-01-29 15:17:20 +0000
committerstanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-01-29 15:17:20 +0000
commitc11dff74c891390eb7b499dcf96ff8a259c4315b (patch)
tree353eaa64ea881d866984f4c5c895dad026566d23
parenta44ecbddff61ca8f01384d6c7a675acb65aa69a9 (diff)
downloadATCD-c11dff74c891390eb7b499dcf96ff8a259c4315b.tar.gz
Merged trunk into branch to pick up fixes for compilation errors.
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/OCI_RE_ChangeLog8
-rw-r--r--ACE/include/makeinclude/platform_sunos5_g++.GNU2
-rw-r--r--CIAO/ChangeLog17
-rw-r--r--CIAO/bin/ciao_tests.lst1
-rwxr-xr-xCIAO/tests/Bug_4087_Regression/run_test.pl52
-rw-r--r--CIAO/tests/Bug_4087_Regression/test.idl29
-rw-r--r--CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp13
-rw-r--r--TAO/ChangeLog29
-rw-r--r--TAO/OCI_RE_ChangeLog19
-rw-r--r--TAO/TAO_IDL/be/be_sequence.cpp15
-rw-r--r--TAO/examples/Advanced/ch_12/client.cpp7
-rw-r--r--TAO/examples/Advanced/ch_18/client.cpp1
-rw-r--r--TAO/examples/Advanced/ch_21/client.cpp4
-rw-r--r--TAO/examples/Advanced/ch_8_and_10/client.cpp4
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp9
-rwxr-xr-xTAO/orbsvcs/tests/Miop/McastFragmentation/run_test.pl1
-rwxr-xr-xTAO/orbsvcs/tests/Miop/McastFragmentation/run_test_ipv6.pl5
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_client.conf2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server.conf2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_m.conf2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_n.conf2
22 files changed, 211 insertions, 20 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index ec7ef0059b3..972a9ddac2a 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 28 23:33:25 UTC 2013 Adam Mitz <mitza@ociweb.com>
+
+ * include/makeinclude/platform_sunos5_g++.GNU:
+
+ Define _POSIX_PTHREAD_SEMANTICS is threads=1,
+ making this config similar to SunCC.
+
Mon Jan 28 07:55:27 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-macosx-mountainlion.h:
diff --git a/ACE/OCI_RE_ChangeLog b/ACE/OCI_RE_ChangeLog
index c3e7962e97e..099be505663 100644
--- a/ACE/OCI_RE_ChangeLog
+++ b/ACE/OCI_RE_ChangeLog
@@ -1,3 +1,9 @@
+Tue Jan 29 15:15:09 UTC 2013 "Kevin Stanley" <stanleyk@ociweb.com>
+
+ * include/makeinclude/platform_sunos5_g++.GNU:
+
+ Merged trunk into branch.
+
Mon Jan 28 16:13:07 UTC 2013 "Kevin Stanley" <stanleyk@ociweb.com>
* ace/config-macosx-lion.h:
@@ -11,7 +17,7 @@ Mon Jan 28 16:13:07 UTC 2013 "Kevin Stanley" <stanleyk@ociweb.com>
Merged trunk into branch. The above files were changed in the
trunk.
-
+
Wed Dec 19 17:52:25 UTC 2012 Phil Mesnier <mesnier_p@ociweb.com>
* ace/Mem_Map.inl:
diff --git a/ACE/include/makeinclude/platform_sunos5_g++.GNU b/ACE/include/makeinclude/platform_sunos5_g++.GNU
index d0c2fc5cdbc..a49ab655591 100644
--- a/ACE/include/makeinclude/platform_sunos5_g++.GNU
+++ b/ACE/include/makeinclude/platform_sunos5_g++.GNU
@@ -29,7 +29,7 @@ CC = gcc
CXX = g++
ifeq ($(threads),1)
- CPPFLAGS += -D_REENTRANT
+ CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
endif
DLD = $(CXX)
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 8b5653eba5a..4ca44a9819d 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,20 @@
+Tue Jan 29 12:20:08 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
+ Fixed bugzilla 4087, thanks to
+ Jiang Wei <jiangwei_1976 at yahoo dot com dot cn> for
+ providing this patch
+
+Tue Jan 29 12:17:09 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/ciao_tests.lst:
+ * tests/Bug_4087_Regression:
+ * tests/Bug_4087_Regression/run_test.pl:
+ * tests/Bug_4087_Regression/test.idl:
+ New unit test for idl3_to_idl2, currently failing. Thanks to
+ Jiang Wei <jiangwei_1976 at yahoo dot com dot cn> for
+ creating this test.
+
Mon Jan 28 10:11:13 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/ciao_tests.lst:
diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst
index a3b1f61abd6..ea9272eb5a5 100644
--- a/CIAO/bin/ciao_tests.lst
+++ b/CIAO/bin/ciao_tests.lst
@@ -41,6 +41,7 @@ TAO/CIAO/tests/Bug_3937_Regression/run_test.pl
TAO/CIAO/tests/Bug_3944_Regression/run_test.pl
TAO/CIAO/tests/Bug_4086_Regression/descriptors/run_test.pl:
TAO/CIAO/tests/Bug_4086_Regression/descriptors/run_test_cdr.pl:
+TAO/CIAO/tests/Bug_4087_Regression/descriptors/run_test.pl:
TAO/CIAO/tests/IDL_Test/Cornucopia/run_test.pl: DOXYGEN
TAO/CIAO/tests/Cookies/run_test.pl
TAO/CIAO/tests/TTSCTest/descriptors/run_test.pl:
diff --git a/CIAO/tests/Bug_4087_Regression/run_test.pl b/CIAO/tests/Bug_4087_Regression/run_test.pl
new file mode 100755
index 00000000000..bc5157e3c14
--- /dev/null
+++ b/CIAO/tests/Bug_4087_Regression/run_test.pl
@@ -0,0 +1,52 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+ & eval 'exec perl -S $0 $argv:q'
+ if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+$status = 0;
+
+my $target = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+
+my $idl3 = "test.idl";
+my $idl2 = "test_IDL2.idl";
+my $target_idl3 = $target->LocalFile ($idl3);
+my $target_idl2 = $target->LocalFile ($idl2);
+$target->DeleteFile($idl2);
+
+$I3toI2 = $target->CreateProcess ("$ENV{'ACE_ROOT'}/bin/tao_idl3_to_idl2",
+ "$target_idl3");
+
+$target_status = $I3toI2->SpawnWaitKill ($target->ProcessStartWaitInterval());
+
+if ($target_status != 0) {
+ print STDERR "ERROR: tao_idl3_to_idl2 returned $target_status\n";
+ exit 1;
+}
+
+if ($target->GetFile ($idl2) == -1) {
+ print STDERR "ERROR: cannot retrieve file <$idl2>\n";
+ exit 1;
+}
+
+# search for right tag in generated idl2
+open (DAT, $idl2) || die ("ERROR: Could not open file <$idl2>!");
+@data=<DAT>;
+close (DAT);
+
+$num = grep (/provide_voltage_/, @data);
+if ($num == 2) {
+ print "TEST OK. Correct operations in there.\n";
+} else {
+ print STDERR "ERROR: generated IDL2 does not contain a brace of provide_voltage_xxx operations !\n\nIDL2 is:\n\n";
+ print "@data\n\n";
+ $status = 1;
+}
+
+$target->DeleteFile($idl2);
+
+exit $status;
diff --git a/CIAO/tests/Bug_4087_Regression/test.idl b/CIAO/tests/Bug_4087_Regression/test.idl
new file mode 100644
index 00000000000..e0c2aa1956d
--- /dev/null
+++ b/CIAO/tests/Bug_4087_Regression/test.idl
@@ -0,0 +1,29 @@
+#ifndef FOO_IDL
+#define FOO_IDL
+
+#include <Components.idl>
+
+interface SetPoint
+{
+ void set(in double value);
+};
+
+interface Measurement
+{
+ double get();
+};
+
+porttype MCPort
+{
+ attribute double default_val;
+ uses SetPoint control;
+ uses Measurement meas;
+};
+
+component Foo
+{
+ mirrorport MCPort voltage;
+
+};
+
+#endif
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
index 352895d686b..04f42c17259 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
@@ -897,7 +897,18 @@ idl3_to_idl2_visitor::visit_porttype_scope_mirror (
break;
}
default:
- return d->ast_accept (this);
+ {
+ if (d->ast_accept (this) == -1)
+ {
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("idl3_to_idl2_visitor")
+ ACE_TEXT ("::visit_porttype_mirror - ")
+ ACE_TEXT ("codegen for mirror port failed\n")),
+ -1);
+ }
+
+ break;
+ }
}
}
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ab22bb18272..4717ec4755a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,32 @@
+Tue Jan 29 11:00:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com>
+
+ * orbsvcs/tests/Miop/McastFragmentation/run_test.pl:
+ * orbsvcs/tests/Miop/McastFragmentation/run_test_ipv6.pl:
+ * orbsvcs/tests/Miop/McastFragmentation/client.cpp:
+ * orbsvcs/tests/Miop/McastFragmentation/uipmc_client.conf:
+ * orbsvcs/tests/Miop/McastFragmentation/uipmc_server.conf:
+ * orbsvcs/tests/Miop/McastFragmentation/uipmc_server_n.conf:
+ * orbsvcs/tests/Miop/McastFragmentation/uipmc_server_m.conf:
+ Minor timing/tuning adjustments and updates.
+
+Tue Jan 29 07:55:44 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/Advanced/ch_21/client.cpp:
+ One more compile fix when ostream is disabled
+
+Mon Jan 28 18:51:42 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/Advanced/ch_12/client.cpp:
+ * examples/Advanced/ch_18/client.cpp:
+ * examples/Advanced/ch_8_and_10/client.cpp:
+ Fixed compile errors when ostream is disabled
+
+Mon Jan 28 18:16:09 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * TAO_IDL/be/be_sequence.cpp:
+ Fixed compile error when using ostream and alternate mapping
+ together
+
Mon Jan 28 12:44:24 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/Advanced/ch_12/client.cpp:
diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index d8b562fabec..0976692fa20 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,22 @@
+Tue Jan 29 15:13:13 UTC 2013 "Kevin Stanley" <stanleyk@ociweb.com>
+
+ * ChangeLog:
+ * TAO_IDL:
+ * TAO_IDL/be/be_sequence.cpp:
+ * examples/Advanced/ch_12/client.cpp:
+ * examples/Advanced/ch_18/client.cpp:
+ * examples/Advanced/ch_21/client.cpp:
+ * examples/Advanced/ch_8_and_10/client.cpp:
+ * orbsvcs/tests/Miop/McastFragmentation/client.cpp:
+ * orbsvcs/tests/Miop/McastFragmentation/run_test.pl:
+ * orbsvcs/tests/Miop/McastFragmentation/run_test_ipv6.pl:
+ * orbsvcs/tests/Miop/McastFragmentation/uipmc_client.conf:
+ * orbsvcs/tests/Miop/McastFragmentation/uipmc_server.conf:
+ * orbsvcs/tests/Miop/McastFragmentation/uipmc_server_m.conf:
+ * orbsvcs/tests/Miop/McastFragmentation/uipmc_server_n.conf:
+
+ Merged Doc group trunk into branch to resolve issues with building examples.
+
Mon Jan 28 22:54:36 UTC 2013 Phillip LaBanca <labancap@ociweb.com>
* orbsvcs/ImplRepo_Service/README:
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 8b203742dbd..0e06a724513 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -391,9 +391,18 @@ be_sequence::gen_ostream_operator (TAO_OutStream *os,
<< "const " << this->name () << " &_tao_sequence" << be_uidt_nl
<< ")" << be_uidt_nl
<< "{" << be_idt_nl
- << "strm << \"" << this->name () << "[\";" << be_nl_2
- << "for (CORBA::ULong i = 0; i < _tao_sequence.length (); ++i)"
- << be_idt_nl
+ << "strm << \"" << this->name () << "[\";" << be_nl_2;
+
+ if (be_global->alt_mapping ())
+ {
+ *os << "for (CORBA::ULong i = 0; i < _tao_sequence.size (); ++i)";
+ }
+ else
+ {
+ *os << "for (CORBA::ULong i = 0; i < _tao_sequence.length (); ++i)";
+ }
+
+ *os << be_idt_nl
<< "{" << be_idt_nl
<< "if (i != 0)" << be_idt_nl
<< "{" << be_idt_nl
diff --git a/TAO/examples/Advanced/ch_12/client.cpp b/TAO/examples/Advanced/ch_12/client.cpp
index f41253a3c67..ff604d77fb1 100644
--- a/TAO/examples/Advanced/ch_12/client.cpp
+++ b/TAO/examples/Advanced/ch_12/client.cpp
@@ -14,7 +14,6 @@
#include "CCSC.h" // ORB-specific
-#include <iterator>
#include <ace/streams.h>
using namespace std;
@@ -23,8 +22,7 @@ using namespace std;
// name, if available, and the repository ID otherwise.
// This inserter may or may not be needed for your ORB.
-#if !defined (GEN_OSTREAM_OPS)
-
+#if 0
static ostream &
operator<< (ostream &os, const CORBA::Exception &e)
{
@@ -39,6 +37,9 @@ operator<< (ostream &os, const CORBA::Exception &e)
os << tc->id ();
return os;
}
+#endif
+
+#if !defined (GEN_OSTREAM_OPS)
// Show the details for a thermometer or thermostat.
diff --git a/TAO/examples/Advanced/ch_18/client.cpp b/TAO/examples/Advanced/ch_18/client.cpp
index 1581a423250..5cb8e6d4266 100644
--- a/TAO/examples/Advanced/ch_18/client.cpp
+++ b/TAO/examples/Advanced/ch_18/client.cpp
@@ -14,7 +14,6 @@
#include "CCSC.h" // ORB-specific
#include "assert.h"
-#include <iterator>
#include <orbsvcs/CosNamingC.h>
#include <ace/streams.h>
// ----------------------------------------------------------------
diff --git a/TAO/examples/Advanced/ch_21/client.cpp b/TAO/examples/Advanced/ch_21/client.cpp
index f07fd00a9f2..ec0563841ca 100644
--- a/TAO/examples/Advanced/ch_21/client.cpp
+++ b/TAO/examples/Advanced/ch_21/client.cpp
@@ -25,6 +25,8 @@ using namespace std;
// This inserter may or may not be needed for your ORB.
#if !defined (GEN_OSTREAM_OPS)
+#if 0
+
static ostream &
operator<<(ostream & os, const CORBA::Exception & e)
{
@@ -40,6 +42,8 @@ operator<<(ostream & os, const CORBA::Exception & e)
return os;
}
+#endif
+
//----------------------------------------------------------------
// Show the details for a thermometer or thermostat.
diff --git a/TAO/examples/Advanced/ch_8_and_10/client.cpp b/TAO/examples/Advanced/ch_8_and_10/client.cpp
index 086dd1bb2c7..0352add409b 100644
--- a/TAO/examples/Advanced/ch_8_and_10/client.cpp
+++ b/TAO/examples/Advanced/ch_8_and_10/client.cpp
@@ -85,6 +85,7 @@ operator<<(std::ostream & os, const CCS::Controller::EChange & ec)
// Generic ostream inserter for exceptions. Inserts the exception
// name, if available, and the repository ID otherwise.
+#if 0
static std::ostream &
operator<<(std::ostream & os, const CORBA::Exception & e)
@@ -100,8 +101,9 @@ operator<<(std::ostream & os, const CORBA::Exception & e)
os << tc->id();
return os;
}
+#endif
- #endif
+#endif
//----------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
index 1fc0e819426..28d5e5fe81b 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
@@ -162,7 +162,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-1);
if (do_shutdown)
- hello->shutdown ();
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("\nClient sending server shutdown message....\n")));
+ ACE_OS::sleep (7);
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("Shutting down NOW\n")));
+ hello->shutdown ();
+ }
else
{
Test::UIPMC_Object_var uipmc_obj = hello->get_object ();
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test.pl b/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test.pl
index 99c705421fa..38cd051aaa5 100755
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test.pl
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test.pl
@@ -59,7 +59,6 @@ $client3->DeleteFile($iorbase);
$SV = $server->CreateProcess ("server",
"-ORBdebuglevel $server_level " .
"-ORBSvcConf $server_svcconf " .
- "-ORBRcvSock 500000 " .
"-o $server_iorfile -u $uipmc -s $orbs " .
"-p $payload -t " .
$threads * 1 . " -c $count");
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test_ipv6.pl b/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test_ipv6.pl
index 41972cfbbdb..55b1b3343ee 100755
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/run_test_ipv6.pl
@@ -19,9 +19,9 @@ $count = 5;
foreach $i (@ARGV) {
if ($i eq '-debug') {
- $server_level = '9';
+ $server_level = '3';
# Level enough for reporting errors.
- $client_level = '3';
+ $client_level = '9';
}
}
@@ -59,7 +59,6 @@ $client3->DeleteFile($iorbase);
$SV = $server->CreateProcess ("server",
"-ORBdebuglevel $server_level " .
"-ORBSvcConf $server_svcconf " .
- "-ORBRcvSock 500000 " .
"-o $server_iorfile -u $uipmc -s $orbs " .
"-p $payload -t " .
$threads * 1 . " -c $count");
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_client.conf b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_client.conf
index c59aa33d716..0b49ba12ea8 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_client.conf
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_client.conf
@@ -3,4 +3,4 @@
dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-dynamic MIOP_Resource_Factory Service_Object * TAO_PortableGroup:_make_TAO_MIOP_Resource_Factory() "-ORBMaxFragmentSize 1400 -ORBMaxFragmentRate 10000 -ORBSendHighWaterMark 2800"
+dynamic MIOP_Resource_Factory Service_Object * TAO_PortableGroup:_make_TAO_MIOP_Resource_Factory() "-ORBMaxFragmentSize 1400 -ORBMaxFragmentRate 14000 -ORBSendHighWaterMark 2800 -ORBSendThrottling 1"
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server.conf b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server.conf
index 59c65c3e068..54785b279a0 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server.conf
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server.conf
@@ -3,4 +3,4 @@
dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-dynamic MIOP_Resource_Factory Service_Object * TAO_PortableGroup:_make_TAO_MIOP_Resource_Factory() "-ORBFragmentsCleanupStrategy delay -ORBFragmentsCleanupBound 10000" # 10 seconds
+dynamic MIOP_Resource_Factory Service_Object * TAO_PortableGroup:_make_TAO_MIOP_Resource_Factory() "-ORBEagerDequeueing 1 -ORBRcvSock 655360 -ORBFragmentsCleanupStrategy delay -ORBFragmentsCleanupBound 10000" # 10 seconds
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_m.conf b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_m.conf
index fd5719e639c..3b7a44ed19e 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_m.conf
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_m.conf
@@ -3,4 +3,4 @@
dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-dynamic MIOP_Resource_Factory Service_Object * TAO_PortableGroup:_make_TAO_MIOP_Resource_Factory() "-ORBFragmentsCleanupStrategy memory -ORBFragmentsCleanupBound 20000000" # ~20MB
+dynamic MIOP_Resource_Factory Service_Object * TAO_PortableGroup:_make_TAO_MIOP_Resource_Factory() "-ORBEagerDequeueing 1 -ORBRcvSock 655360 -ORBFragmentsCleanupStrategy memory -ORBFragmentsCleanupBound 20000000" # ~20MB
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_n.conf b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_n.conf
index 50f426eba20..5286fbd046e 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_n.conf
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/uipmc_server_n.conf
@@ -3,4 +3,4 @@
dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-dynamic MIOP_Resource_Factory Service_Object * TAO_PortableGroup:_make_TAO_MIOP_Resource_Factory() "-ORBFragmentsCleanupStrategy number -ORBFragmentsCleanupBound 50" # 50 messages
+dynamic MIOP_Resource_Factory Service_Object * TAO_PortableGroup:_make_TAO_MIOP_Resource_Factory() "-ORBEagerDequeueing 1 -ORBRcvSock 655360 -ORBFragmentsCleanupStrategy number -ORBFragmentsCleanupBound 50" # 50 messages