diff options
| author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-08 18:55:16 +0000 |
|---|---|---|
| committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-08 18:55:16 +0000 |
| commit | f222e07e559b62628d92ce0849760b95e0d1ca18 (patch) | |
| tree | 18f26829132a888565c20fa8a2d006feeda13ca6 | |
| parent | 148af15f13dd2cdad344311b152269c9b971d621 (diff) | |
| download | ATCD-f222e07e559b62628d92ce0849760b95e0d1ca18.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/CCM_Component.idl | 2 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/CCM_Core.mpc | 2 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp | 5 | ||||
| -rwxr-xr-x | TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl | 2 | ||||
| -rwxr-xr-x | TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl | 2 | ||||
| -rwxr-xr-x | TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Component.idl b/TAO/CIAO/DAnCE/ciao/CCM_Component.idl index c24bf884d7b..55daac21be5 100644 --- a/TAO/CIAO/DAnCE/ciao/CCM_Component.idl +++ b/TAO/CIAO/DAnCE/ciao/CCM_Component.idl @@ -132,7 +132,7 @@ module Components ComponentPortDescription get_all_ports (); - attribute UUID component_UUID; + //attribute UUID component_UUID; }; // @@ Enumeration and DefaultEnumeration are only for EJB to CCM diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc index fb3846a7de9..75134687e83 100644 --- a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc +++ b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc @@ -106,7 +106,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client { idlflags += -Wb,skel_export_include=Deployment_svnt_export.h dynamicflags = DEPLOYMENT_STUB_BUILD_DLL - libs += CIAO_DnC_Events + libs += CIAO_DnC_Client CIAO_DnC_Events IDL_Files { NodeApplication_CallBack.idl diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp index 25823066248..39ce2039c06 100644 --- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp +++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp @@ -78,8 +78,11 @@ CIAO::NodeApplication_Impl::finishLaunch ( _narrow (providedReference[i].endpoint.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; + if (CORBA::is_nil (consumer.in ())) - ACE_THROW (Deployment::InvalidConnection ()); + { + ACE_THROW (Deployment::InvalidConnection ()); + } comp->subscribe (providedReference[i].portName.in (), consumer.in () diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl index 66bd2b1120f..dc8afc09a22 100755 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl @@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) { unlink $iorfile; $CIAO_ROOT=$ENV{'CIAO_ROOT'}; -$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication", +$SV = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication", "-n -o $iorfile"); $CL = new PerlACE::Process ("client", diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl index 1840175abde..ccb27eab392 100755 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl @@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) { unlink $iorfile; $CIAO_ROOT=$ENV{'CIAO_ROOT'}; -$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication", +$SV = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication", "-n -o $iorfile"); $CL = new PerlACE::Process ("client_ex", diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl index 26b7edf2c14..0d0253e2b5d 100755 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl @@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) { unlink $iorfile; $CIAO_ROOT=$ENV{'CIAO_ROOT'}; -$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication", +$SV = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication", "-n -o $iorfile"); $CL = new PerlACE::Process ("client_simple", |