[Benson-commit] CVS: benson2/src/modules/Benson Benson.xs,1.9,1.10 Queue_util.cc,1.3,1.4

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/Benson
In directory usw-pr-cvs1:/tmp/cvs-serv24671/src/modules/Benson

Modified Files:
	Benson.xs Queue_util.cc 
Log Message:
This is somewhat experimental stuff, don't use for real

Index: Benson.xs
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Benson/Benson.xs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Benson.xs	2001/07/04 01:22:36	1.9
--- Benson.xs	2001/07/15 02:00:55	1.10
***************
*** 32,35 ****
--- 32,36 ----
  	string forwarder;
  	string port;
+ 	struct orb_connector *c;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 57,60 ****
--- 58,64 ----
  	try {
  		obj = bind_queue(forwarder.c_str());
+ 		if(CORBA::is_nil(obj)) {
+ 			throw;
+ 		}
  		Queue_var tm = Queue::_narrow(obj);
  		tm->submit(agent.c_str(),msg.c_str(),sev.c_str(),subsys.c_str());
***************
*** 82,85 ****
--- 86,90 ----
  	string forwarder;
  	string port;
+ 	struct orb_connector *c;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 128,131 ****
--- 133,137 ----
  	AV* arrayOfAlerts;
  	HV* hashedAlert;
+ 	struct orb_connector *c;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 146,151 ****
--- 152,161 ----
  	try {
  		obj = bind_queue(forwarder.c_str());
+ 		if(CORBA::is_nil(obj)) {
+ 			throw;
+ 		}
  		Queue_var tm = Queue::_narrow(obj);
  		alerts = tm->alert_list();
+ 		cerr << "CORBA just called alert_list" << endl;
  		for(CORBA::ULong idx = 0; idx < alerts->length(); idx++) {
  			Alert current;
***************
*** 176,179 ****
--- 186,190 ----
  				newRV_noinc((SV*)hashedAlert));
  		}
+ 		delete obj;
  	} catch (CORBA::Exception &e) {
  		cerr << "Benson::alert_list exception: " << e << endl;
***************
*** 197,200 ****
--- 208,212 ----
  	string forwarder;
  	string port;
+ 	struct orb_connector *c;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 238,241 ****
--- 250,254 ----
  	string forwarder;
  	string port;
+ 	struct orb_connector *c;
  	CORBA::Object_var obj;
  	SV* self;

Index: Queue_util.cc
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Benson/Queue_util.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Queue_util.cc	2001/05/01 03:37:01	1.3
--- Queue_util.cc	2001/07/15 02:00:55	1.4
***************
*** 8,16 ****
   	fargv[fargc++] = (char*)forwarder;
  
! 	CORBA::ORB_var orb = CORBA::ORB_init(fargc,fargv,"mico-local-orb");
! 	CORBA::BOA_var boa = orb->BOA_init(fargc,fargv,"mico-local-boa");
  
  	assert(fargc == 2);
! 	CORBA::Object_var obj = orb->bind("IDL:newportal.com/Queue:1.0", fargv[1]);
  	if(CORBA::is_nil (obj)) {
  		except = "cannot bind to ";
--- 8,21 ----
   	fargv[fargc++] = (char*)forwarder;
  
! 	CORBA::ORB_var orb =
! 		CORBA::ORB_init(fargc,fargv,"mico-local-orb");
! 	CORBA::BOA_var boa =
! 		orb->BOA_init(fargc,fargv,"mico-local-boa");
  
  	assert(fargc == 2);
! 	CORBA::Object_var obj =
! 		orb->bind("IDL:newportal.com/Queue:1.0", fargv[1]);
! 	cerr << "CORBA binding object: " << obj << endl;   
! 	
  	if(CORBA::is_nil (obj)) {
  		except = "cannot bind to ";