summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-11-26 19:04:00 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-11-26 19:04:00 +0000
commitdc358014515d6ae12631ee27c4ffe054ce8d2257 (patch)
treeec7278ab27eae7f26cd631c91449c1db3de6aef3
parent02f003fb746dd1b8ae9351cf5e1d01777a825446 (diff)
downloadATCD-dc358014515d6ae12631ee27c4ffe054ce8d2257.tar.gz
Thu Nov 26 19:03:37 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: Check if we successfully constructed the commandline
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp16
2 files changed, 15 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 2363f480ee3..30904f94830 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 26 19:03:37 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp:
+ Check if we successfully constructed the commandline
+
Thu Nov 26 18:52:37 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/ComponentServer/CIAO_ComponentServer_Task.cpp:
diff --git a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp
index 792b079f888..17af866c4a8 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp
+++ b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp
@@ -289,8 +289,6 @@ namespace CIAO
{
CIAO_TRACE ("CIAO_ServerActivator_i::spawn_component_server");
- ACE_Process_Options options;
-
// Get my object reference
CORBA::Object_var obj = this->poa_->servant_to_reference (this);
CORBA::String_var ior = this->orb_->object_to_string (obj.in ());
@@ -310,10 +308,16 @@ namespace CIAO
"Using default component server executable\n"));
}
- options.command_line ("%s %s -c %s",
- path,
- cmd_line.c_str (),
- ior.in ());
+ ACE_Process_Options options;
+ if (options.command_line ("%s %s -c %s",
+ path,
+ cmd_line.c_str (),
+ ior.in ()) != 0)
+ {
+ CIAO_ERROR ((LM_ERROR, CLINFO
+ "Failed to create commandline\n"));
+ throw Components::CreateFailure (CIAO::SERVER_SPAWN_FAILURE);
+ }
options.avoid_zombies (0);