From e66f9efba24af33e3cdfa1390993ac8edcb8ccc1 Mon Sep 17 00:00:00 2001
From: wierenga <sdos@astron.nl>
Date: Fri, 16 Sep 2005 08:25:42 +0000
Subject: [PATCH] bugid:210 run BeamServer task within try {} catch block to
catch Exceptions.
---
MAC/APL/PAC/BeamServer/src/BeamServer.cc | 8 ++++----
MAC/APL/PAC/BeamServer/src/BeamServer.conf.in | 2 +-
MAC/APL/PAC/BeamServer/src/BeamServerPorts.conf.in | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/MAC/APL/PAC/BeamServer/src/BeamServer.cc b/MAC/APL/PAC/BeamServer/src/BeamServer.cc
index afd61041d94..bfda941e60d 100644
--- a/MAC/APL/PAC/BeamServer/src/BeamServer.cc
+++ b/MAC/APL/PAC/BeamServer/src/BeamServer.cc
@@ -836,12 +836,12 @@ int main(int argc, char** argv)
exit(EXIT_FAILURE);
}
- BeamServer beamserver("BeamServer");
-
- beamserver.start(); // make initial transition
-
try
{
+ BeamServer beamserver("BeamServer");
+
+ beamserver.start(); // make initial transition
+
GCFTask::run();
}
catch (Exception e)
diff --git a/MAC/APL/PAC/BeamServer/src/BeamServer.conf.in b/MAC/APL/PAC/BeamServer/src/BeamServer.conf.in
index 801a136268e..cf955ebf365 100644
--- a/MAC/APL/PAC/BeamServer/src/BeamServer.conf.in
+++ b/MAC/APL/PAC/BeamServer/src/BeamServer.conf.in
@@ -1,5 +1,5 @@
#
-# Configuration of the BeamServern
+# Configuration of the BeamServer
#
#
diff --git a/MAC/APL/PAC/BeamServer/src/BeamServerPorts.conf.in b/MAC/APL/PAC/BeamServer/src/BeamServerPorts.conf.in
index a444a74550d..faf2c6ba8b7 100644
--- a/MAC/APL/PAC/BeamServer/src/BeamServerPorts.conf.in
+++ b/MAC/APL/PAC/BeamServer/src/BeamServerPorts.conf.in
@@ -9,7 +9,7 @@ mac.ns.BeamServer.acceptor.type=TCP
mac.ns.BeamServer.rspdriver.type=TCP
mac.top.BeamServer.rspdriver.remoteservice=RSPDriver:acceptor
mac.ns.BeamServer.calserver.type=TCP
-mac.top.BeamServer.calserver.remoteservice=CalServer:acceptor_v2
+mac.top.BeamServer.calserver.remoteservice=CalServer:acceptor
#
# RSPDriver configuration
--
GitLab