summaryrefslogtreecommitdiff
path: root/TAO/examples/POA
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples/POA')
-rw-r--r--TAO/examples/POA/Adapter_Activator/server.cpp5
-rw-r--r--TAO/examples/POA/DSI/server.cpp4
-rw-r--r--TAO/examples/POA/Default_Servant/server.cpp5
-rw-r--r--TAO/examples/POA/Explicit_Activation/server.cpp4
-rw-r--r--TAO/examples/POA/Forwarding/server.cpp9
-rw-r--r--TAO/examples/POA/Loader/Server_Manager.cpp7
-rw-r--r--TAO/examples/POA/On_Demand_Activation/server.cpp4
-rw-r--r--TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp7
-rw-r--r--TAO/examples/POA/Reference_Counted_Servant/server.cpp4
-rw-r--r--TAO/examples/POA/TIE/server.cpp4
10 files changed, 23 insertions, 30 deletions
diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
index 03f10f6b015..4d1e25cf9ed 100644
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ b/TAO/examples/POA/Adapter_Activator/server.cpp
@@ -430,8 +430,9 @@ main (int argc, char **argv)
poa_manager->activate (ACE_TRY_ENV);
ACE_TRY_CHECK;
- if (orb->run () == -1)
- ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+ orb->run (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+
}
ACE_CATCHANY
{
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index 9fc3fc567d2..334038c62a3 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -200,8 +200,8 @@ main (int argc, char **argv)
ACE_TRY_CHECK;
// Run the ORB
- if (orb->run () == -1)
- ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+ orb->run (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp
index 6d786bcc182..5a34e913b69 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -161,8 +161,9 @@ main (int argc, char **argv)
ACE_TRY_CHECK;
// Run the ORB
- if (orb->run () == -1)
- ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+ orb->run (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+
}
ACE_CATCHANY
{
diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp
index cfd49439658..456e3c712b3 100644
--- a/TAO/examples/POA/Explicit_Activation/server.cpp
+++ b/TAO/examples/POA/Explicit_Activation/server.cpp
@@ -309,8 +309,8 @@ main (int argc, char **argv)
poa_manager->activate (ACE_TRY_ENV);
ACE_TRY_CHECK;
- if (orb->run () == -1)
- ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+ orb->run (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
ACE_TIMEPROBE_PRINT;
}
diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp
index 64879ed88ef..43623dc0ff1 100644
--- a/TAO/examples/POA/Forwarding/server.cpp
+++ b/TAO/examples/POA/Forwarding/server.cpp
@@ -212,14 +212,11 @@ main (int argc,
poa_manager->activate (ACE_TRY_ENV);
ACE_TRY_CHECK;
- if (orb->run (ACE_TRY_ENV) == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p\n",
- "CORBA::ORB::run"),
- -1);
+ orb->run (ACE_TRY_ENV);
ACE_TRY_CHECK;
- orb->destroy ();
+ orb->destroy (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index 68d3199b557..3988d01dc8d 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -367,11 +367,8 @@ Server_i::run (void)
ACE_TRY_CHECK;
// Run the ORB.
- if (orb_->run () == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p\n",
- "CORBA::ORB::run"),
- -1);
+ orb_->run (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index 31488ddea2f..875341ff073 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -264,8 +264,8 @@ main (int argc, char **argv)
ACE_TRY_CHECK;
// Run the ORB.
- if (orb->run () == -1)
- ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+ orb->run (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index f6af48b38e1..3818fa20739 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -357,11 +357,8 @@ Server_i::run (void)
ACE_TRY_CHECK;
// Run the ORB.
- if (orb_->run () == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p\n",
- "CORBA::ORB::run"),
- -1);
+ orb_->run (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
index 012a98199da..8185e99fad6 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp
+++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
@@ -169,8 +169,8 @@ main (int argc, char **argv)
poa_manager->activate (ACE_TRY_ENV);
ACE_TRY_CHECK;
- if (orb->run () == -1)
- ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+ orb->run (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp
index c4d8558e5fb..1e2d1eb506b 100644
--- a/TAO/examples/POA/TIE/server.cpp
+++ b/TAO/examples/POA/TIE/server.cpp
@@ -248,8 +248,8 @@ main (int argc, char **argv)
poa_manager->activate (ACE_TRY_ENV);
ACE_TRY_CHECK;
- if (orb->run () == -1)
- ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+ orb->run (ACE_TRY_ENV);
+ ACE_TRY_CHECK;
}
ACE_CATCHANY
{
View Lorry Controller Status