[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libCERTI/Interaction.cc libCERTI/ObjectCl...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi libCERTI/Interaction.cc libCERTI/ObjectCl... |
|
Date: |
Mon, 14 Sep 2009 21:21:33 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 09/09/14 21:21:32
Modified files:
libCERTI : Interaction.cc ObjectClass.cc NetworkMessage.cc
SocketMC.cc ObjectSet.cc NM_Classes.cc
NM_Classes.hh NetworkMessage.hh
ObjectClassBroadcastList.cc
RTIG : Federation.cc RTIG_processing.cc RTIG.cc
RTIA : ObjectManagement.cc DeclarationManagement.cc
DataDistribution.cc FederationManagement.cc
TimeManagement.cc OwnershipManagement.cc
Log message:
A step further for a clean NetworkMessage class (to be continued)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.cc?cvsroot=certi&r1=3.51&r2=3.52
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClass.cc?cvsroot=certi&r1=3.64&r2=3.65
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.cc?cvsroot=certi&r1=3.39&r2=3.40
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketMC.cc?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectSet.cc?cvsroot=certi&r1=3.23&r2=3.24
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&r1=3.18&r2=3.19
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&r1=3.12&r2=3.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.48&r2=3.49
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.cc?cvsroot=certi&r1=3.25&r2=3.26
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.108&r2=3.109
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.84&r2=3.85
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&r1=3.56&r2=3.57
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.60&r2=3.61
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/DeclarationManagement.cc?cvsroot=certi&r1=3.26&r2=3.27
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/DataDistribution.cc?cvsroot=certi&r1=3.27&r2=3.28
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.cc?cvsroot=certi&r1=3.70&r2=3.71
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.49&r2=3.50
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/OwnershipManagement.cc?cvsroot=certi&r1=3.17&r2=3.18
Patches:
Index: libCERTI/Interaction.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.cc,v
retrieving revision 3.51
retrieving revision 3.52
diff -u -b -r3.51 -r3.52
--- libCERTI/Interaction.cc 9 Nov 2008 12:41:40 -0000 3.51
+++ libCERTI/Interaction.cc 14 Sep 2009 21:21:31 -0000 3.52
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Interaction.cc,v 3.51 2008/11/09 12:41:40 gotthardp Exp $
+// $Id: Interaction.cc,v 3.52 2009/09/14 21:21:31 erk Exp $
// ----------------------------------------------------------------------------
@@ -424,7 +424,7 @@
InteractionBroadcastList *ibList = NULL ;
if (server != NULL) {
NetworkMessage *answer =
NM_Factory::create(NetworkMessage::RECEIVE_INTERACTION) ;
- answer->exception = e_NO_EXCEPTION ;
+ answer->setException (e_NO_EXCEPTION);
answer->federation = server->federation();
answer->federate = federate_handle ;
answer->interactionClass = handle ; // Interaction Class Handle
@@ -484,7 +484,7 @@
InteractionBroadcastList *ibList = NULL ;
if (server != NULL) {
NetworkMessage *answer =
NM_Factory::create(NetworkMessage::RECEIVE_INTERACTION) ;
- answer->exception = e_NO_EXCEPTION ;
+ answer->setException(e_NO_EXCEPTION);
answer->federation = server->federation();
answer->federate = federate_handle ;
answer->interactionClass = handle ; // Interaction Class Handle
@@ -547,4 +547,4 @@
} // namespace certi
-// $Id: Interaction.cc,v 3.51 2008/11/09 12:41:40 gotthardp Exp $
+// $Id: Interaction.cc,v 3.52 2009/09/14 21:21:31 erk Exp $
Index: libCERTI/ObjectClass.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClass.cc,v
retrieving revision 3.64
retrieving revision 3.65
diff -u -b -r3.64 -r3.65
--- libCERTI/ObjectClass.cc 16 Dec 2008 07:08:29 -0000 3.64
+++ libCERTI/ObjectClass.cc 14 Sep 2009 21:21:31 -0000 3.65
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClass.cc,v 3.64 2008/12/16 07:08:29 approx Exp $
+// $Id: ObjectClass.cc,v 3.65 2009/09/14 21:21:31 erk Exp $
// ----------------------------------------------------------------------------
#include "Object.hh"
@@ -360,7 +360,7 @@
NetworkMessage *answer =
NM_Factory::create(NetworkMessage::REMOVE_OBJECT);
answer->federation = server->federation();
answer->federate = the_federate ;
- answer->exception = e_NO_EXCEPTION ;
+ answer->setException(e_NO_EXCEPTION);
answer->objectClass = handle ; // Class Handle
answer->object = the_object ;
@@ -752,7 +752,7 @@
NM_Discover_Object *answer = new NM_Discover_Object();
answer->federation = server->federation();
answer->federate = the_federate ;
- answer->exception = e_NO_EXCEPTION ;
+ answer->setException(e_NO_EXCEPTION) ;
answer->objectClass = handle ; // Class Handle
answer->object = the_object->getHandle();
answer->setLabel(the_object->getName().c_str());
@@ -802,7 +802,7 @@
message.federation = server->federation();
message.federate = federate ;
- message.exception = e_NO_EXCEPTION ;
+ message.setException(e_NO_EXCEPTION) ;
message.objectClass = super_handle ;
message.object = (*o)->getHandle();
message.setLabel((*o)->getName().c_str());
@@ -909,7 +909,7 @@
NetworkMessage *answer =
NM_Factory::create(NetworkMessage::REFLECT_ATTRIBUTE_VALUES);
answer->federation = server->federation();
answer->federate = the_federate ;
- answer->exception = e_NO_EXCEPTION ;
+ answer->setException(e_NO_EXCEPTION) ;
answer->object = object->getHandle();
// with time
answer->setDate(the_time);
@@ -972,7 +972,7 @@
NetworkMessage *answer =
NM_Factory::create(NetworkMessage::REFLECT_ATTRIBUTE_VALUES) ;
answer->federation = server->federation();
answer->federate = the_federate ;
- answer->exception = e_NO_EXCEPTION ;
+ answer->setException(e_NO_EXCEPTION) ;
answer->object = object->getHandle();
// without time
@@ -1128,7 +1128,7 @@
if (compteur_assumption !=0) {
AnswerAssumption->federation = server->federation();
AnswerAssumption->federate = theFederateHandle ;
- AnswerAssumption->exception = e_NO_EXCEPTION ;
+ AnswerAssumption->setException(e_NO_EXCEPTION) ;
AnswerAssumption->object = theObjectHandle ;
AnswerAssumption->setLabel(theTag);
AnswerAssumption->handleArraySize = compteur_assumption ;
@@ -1210,14 +1210,14 @@
NetworkMessage *Answer_notification =
NM_Factory::create(NetworkMessage::ATTRIBUTE_OWNERSHIP_ACQUISITION_NOTIFICATION);
Answer_notification->federation = server->federation();
Answer_notification->federate = the_federate ;
- Answer_notification->exception = e_NO_EXCEPTION ;
+ Answer_notification->setException(e_NO_EXCEPTION) ;
Answer_notification->object = the_object ;
Answer_notification->handleArray.resize(theListSize) ;
NetworkMessage *Answer_unavailable =
NM_Factory::create(NetworkMessage::ATTRIBUTE_OWNERSHIP_UNAVAILABLE) ;
Answer_unavailable->federation = server->federation();
Answer_unavailable->federate = the_federate ;
- Answer_unavailable->exception = e_NO_EXCEPTION ;
+ Answer_unavailable->setException(e_NO_EXCEPTION) ;
Answer_unavailable->object = the_object ;
Answer_unavailable->handleArray.resize(theListSize) ;
@@ -1385,7 +1385,7 @@
if (compteur_assumption != 0) {
AnswerAssumption->federation = server->federation();
AnswerAssumption->federate = theFederateHandle ;
- AnswerAssumption->exception = e_NO_EXCEPTION ;
+ AnswerAssumption->setException(e_NO_EXCEPTION) ;
AnswerAssumption->object = theObjectHandle ;
AnswerAssumption->setLabel(std::string(""));
AnswerAssumption->handleArraySize = compteur_assumption ;
@@ -1476,7 +1476,7 @@
AnswerNotification->federation = server->federation();
AnswerNotification->federate = theFederateHandle ;
- AnswerNotification->exception = e_NO_EXCEPTION ;
+ AnswerNotification->setException(e_NO_EXCEPTION) ;
AnswerNotification->object = theObjectHandle ;
AnswerNotification->handleArray.resize(theListSize) ;
@@ -1699,7 +1699,7 @@
NetworkMessage *answer_confirmation =
NM_Factory::create(NetworkMessage::CONFIRM_ATTRIBUTE_OWNERSHIP_ACQUISITION_CANCELLATION);
answer_confirmation->federation = server->federation();
answer_confirmation->federate = federate_handle ;
- answer_confirmation->exception = e_NO_EXCEPTION ;
+ answer_confirmation->setException(e_NO_EXCEPTION) ;
answer_confirmation->object = object_handle ;
answer_confirmation->handleArray.resize(list_size) ;
@@ -1835,4 +1835,4 @@
} // namespace certi
-// $Id: ObjectClass.cc,v 3.64 2008/12/16 07:08:29 approx Exp $
+// $Id: ObjectClass.cc,v 3.65 2009/09/14 21:21:31 erk Exp $
Index: libCERTI/NetworkMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.cc,v
retrieving revision 3.39
retrieving revision 3.40
diff -u -b -r3.39 -r3.40
--- libCERTI/NetworkMessage.cc 14 Sep 2009 17:54:08 -0000 3.39
+++ libCERTI/NetworkMessage.cc 14 Sep 2009 21:21:31 -0000 3.40
@@ -16,7 +16,7 @@
// License along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: NetworkMessage.cc,v 3.39 2009/09/14 17:54:08 erk Exp $
+// $Id: NetworkMessage.cc,v 3.40 2009/09/14 21:21:31 erk Exp $
// ----------------------------------------------------------------------------
@@ -36,15 +36,14 @@
// ----------------------------------------------------------------------------
NetworkMessage::NetworkMessage()
- : exception(e_NO_EXCEPTION),
- type(NOT_USED),
+ : type(NOT_USED), exception(e_NO_EXCEPTION),
+
_isDated(false),
_isLabelled(false),
_isTagged(false)
{
name = std::string("NetworkMessage (generic)");
exceptionReason = std::string("") ;
- number = 0 ;
federation = 0 ;
federate = 0 ;
@@ -162,4 +161,4 @@
} // namespace certi
-// $Id: NetworkMessage.cc,v 3.39 2009/09/14 17:54:08 erk Exp $
+// $Id: NetworkMessage.cc,v 3.40 2009/09/14 21:21:31 erk Exp $
Index: libCERTI/SocketMC.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketMC.cc,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- libCERTI/SocketMC.cc 2 Apr 2009 19:58:08 -0000 3.17
+++ libCERTI/SocketMC.cc 14 Sep 2009 21:21:31 -0000 3.18
@@ -191,7 +191,8 @@
{
int cnt ;
- message->number=_num_msg ;
+ //message->number=_num_msg ;
+ // FIXME EN: SocketMC is now broken for several release
_num_msg++ ;
assert(_est_init_mc);
assert(message != NULL);
Index: libCERTI/ObjectSet.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectSet.cc,v
retrieving revision 3.23
retrieving revision 3.24
diff -u -b -r3.23 -r3.24
--- libCERTI/ObjectSet.cc 4 Jun 2009 11:57:19 -0000 3.23
+++ libCERTI/ObjectSet.cc 14 Sep 2009 21:21:31 -0000 3.24
@@ -197,7 +197,6 @@
throw (RTIinternalError)
{
std::map<ObjectHandle, Object *>::iterator i = begin();
-
while( i != end() ) {
if ((i->second)->getOwner() == the_federate) {
std::map<ObjectHandle, Object *>::erase(i);
@@ -252,7 +251,7 @@
}
answer->federation = server->federation();
- answer->exception = e_NO_EXCEPTION ;
+ answer->setException(e_NO_EXCEPTION);
answer->object = the_object ;
answer->handleArray.resize(1) ;
answer->handleArray[0] = the_attribute ;
@@ -463,4 +462,4 @@
}
} // namespace certi
-// $Id: ObjectSet.cc,v 3.23 2009/06/04 11:57:19 erk Exp $
+// $Id: ObjectSet.cc,v 3.24 2009/09/14 21:21:31 erk Exp $
Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.cc,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -b -r3.18 -r3.19
--- libCERTI/NM_Classes.cc 14 Sep 2009 17:54:08 -0000 3.18
+++ libCERTI/NM_Classes.cc 14 Sep 2009 21:21:31 -0000 3.19
@@ -1793,8 +1793,8 @@
/* specific code (if any) goes here */
msgBuffer.write_string(federateName);
msgBuffer.write_string(FEDid);
- msgBuffer.write_int16(number);
- if (number) {
+ msgBuffer.write_int16(lineno);
+ if (lineno>0) {
msgBuffer.write_string(line);
}
} /* end of serialize */
@@ -1804,8 +1804,8 @@
/* specific code (if any) goes here */
federateName = msgBuffer.read_string();
FEDid = msgBuffer.read_string();
- number = msgBuffer.read_int16();
- if (number) {
+ lineno = msgBuffer.read_int16();
+ if (lineno>0) {
line = msgBuffer.read_string();
}
} /* end of deserialize */
Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.hh,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- libCERTI/NM_Classes.hh 14 Sep 2009 17:54:08 -0000 3.12
+++ libCERTI/NM_Classes.hh 14 Sep 2009 21:21:32 -0000 3.13
@@ -1533,16 +1533,15 @@
void setFederateName(std::string newFederateName)
{federateName=newFederateName;};
void setFEDid(std::string newFEDid) {FEDid=newFEDid;};
const std::string getFEDid() const {return FEDid;};
- // void setLineFollows() {lineFollows=true;};
- // void unsetLineFollows() {lineFollows=true;};
- //const bool getLineFollows() {return lineFollows;};
+ uint32_t getLineno() {return lineno;};
+ void setLineno(uint32_t newLineno) {lineno=newLineno;};
void setFEDLine(std::string newLine) {line=newLine;};
std::string getFEDLine() {return line;};
protected:
/* specific field */
std::string federateName;// the Federate name
std::string FEDid;
- // bool lineFollows;
+ uint32_t lineno;
std::string line;
private:
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.48
retrieving revision 3.49
diff -u -b -r3.48 -r3.49
--- libCERTI/NetworkMessage.hh 14 Sep 2009 17:54:08 -0000 3.48
+++ libCERTI/NetworkMessage.hh 14 Sep 2009 21:21:32 -0000 3.49
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.48 2009/09/14 17:54:08 erk Exp $
+// $Id: NetworkMessage.hh,v 3.49 2009/09/14 21:21:32 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -153,6 +153,8 @@
const NetworkMessage::Message_T getType() const {return type;};
const TypeException getException() const {return exception;};
+ TypeException& getRefException() {return exception;};
+ void setException(const TypeException except) {exception=except;};
/**
* Serialize the message into a buffer
@@ -194,8 +196,6 @@
void displayValueArray(char *);
- UShort number ;
-
int bestEffortPeer ;
unsigned long bestEffortAddress ;
@@ -257,11 +257,7 @@
/** The name corresponding to message type */
const std::string getName() const {return name;}
- /**
- * The exception type
- * if the message is carrying an exception
- */
- TypeException exception ;
+
/**
* The federation handle
* the message is part of this federation activity
@@ -279,6 +275,7 @@
std::string exceptionReason;
protected:
+
/**
* The message name.
* should be initialized by the specialized
@@ -294,6 +291,12 @@
*/
Message_T type;
+ /**
+ * The exception type
+ * if the message is carrying an exception
+ */
+ TypeException exception ;
+
private:
/**
* The date of message if it is dated.
@@ -343,4 +346,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.48 2009/09/14 17:54:08 erk Exp $
+// $Id: NetworkMessage.hh,v 3.49 2009/09/14 21:21:32 erk Exp $
Index: libCERTI/ObjectClassBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.cc,v
retrieving revision 3.25
retrieving revision 3.26
diff -u -b -r3.25 -r3.26
--- libCERTI/ObjectClassBroadcastList.cc 18 Sep 2008 14:41:29 -0000
3.25
+++ libCERTI/ObjectClassBroadcastList.cc 14 Sep 2009 21:21:32 -0000
3.26
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassBroadcastList.cc,v 3.25 2008/09/18 14:41:29 gotthardp Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.26 2009/09/14 21:21:32 erk Exp $
// ----------------------------------------------------------------------------
@@ -66,7 +66,7 @@
// Copy static informations.
NetworkMessage *reducedMessage = NM_Factory::create(message->getType());
- reducedMessage->exception = message->exception ;
+ reducedMessage->setException(message->getException());
reducedMessage->federation = message->federation ;
reducedMessage->federate = message->federate ;
reducedMessage->object = message->object ;
@@ -401,4 +401,4 @@
} // namespace certi
-// $Id: ObjectClassBroadcastList.cc,v 3.25 2008/09/18 14:41:29 gotthardp Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.26 2009/09/14 21:21:32 erk Exp $
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.108
retrieving revision 3.109
diff -u -b -r3.108 -r3.109
--- RTIG/Federation.cc 12 Aug 2009 13:48:36 -0000 3.108
+++ RTIG/Federation.cc 14 Sep 2009 21:21:32 -0000 3.109
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: Federation.cc,v 3.108 2009/08/12 13:48:36 erk Exp $
+// $Id: Federation.cc,v 3.109 2009/09/14 21:21:32 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -715,7 +715,7 @@
handle, federate_handle, time.getTime());
NM_Set_Time_Regulating msg ;
- msg.exception = e_NO_EXCEPTION ;
+ msg.setException(e_NO_EXCEPTION);
msg.federation = handle ;
msg.federate = federate_handle ;
msg.regulatorOn();
@@ -2582,5 +2582,5 @@
}} // namespace certi/rtig
-// $Id: Federation.cc,v 3.108 2009/08/12 13:48:36 erk Exp $
+// $Id: Federation.cc,v 3.109 2009/09/14 21:21:32 erk Exp $
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.84
retrieving revision 3.85
diff -u -b -r3.84 -r3.85
--- RTIG/RTIG_processing.cc 14 Sep 2009 17:54:09 -0000 3.84
+++ RTIG/RTIG_processing.cc 14 Sep 2009 21:21:32 -0000 3.85
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: RTIG_processing.cc,v 3.84 2009/09/14 17:54:09 erk Exp $
+// $Id: RTIG_processing.cc,v 3.85 2009/09/14 21:21:32 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -88,22 +88,22 @@
}
catch (CouldNotOpenFED e)
{
- rep.exception = e_CouldNotOpenFED ;
+ rep.setException(e_CouldNotOpenFED);
rep.exceptionReason=e._reason;
}
catch (ErrorReadingFED e)
{
- rep.exception = e_ErrorReadingFED ;
+ rep.setException(e_ErrorReadingFED);
rep.exceptionReason = e._reason ;
}
catch (FederationExecutionAlreadyExists e)
{
- rep.exception = e_FederationExecutionAlreadyExists ;
+ rep.setException(e_FederationExecutionAlreadyExists);
rep.exceptionReason =e._reason ;
}
#endif
// Prepare answer for RTIA : store NetworkMessage rep
- if ( rep.exception == e_NO_EXCEPTION )
+ if ( rep.getException() == e_NO_EXCEPTION )
{
rep.federation = h ;
rep.setFEDid(FEDid);
@@ -166,7 +166,7 @@
// RTIA waits a GET_FED_FILE message
// RTIG says not OK to RTIA in a GET_FED_FILE message
NM_Get_FED_File repFED ;
- repFED.exception = e_FederateAlreadyExecutionMember ;
+ repFED.setException(e_FederateAlreadyExecutionMember);
repFED.exceptionReason="Federate with same name has yet joined the
federation";
G.Out(pdGendoc,"processJoinFederation==>Answer to RTIA GFF ERROR
%s",repFED.exceptionReason.c_str());
repFED.send(link,NM_msgBufSend);
@@ -176,7 +176,7 @@
// FIXME strange to send 2 messages?
// Prepare answer about JoinFederationExecution
NM_Join_Federation_Execution rep ;
- rep.exception = e_FederateAlreadyExecutionMember ;
+ rep.setException(e_FederateAlreadyExecutionMember);
rep.exceptionReason = "Federate with same name has yet joined the
federation";
G.Out(pdGendoc,"processJoinFederation==>Answer to RTIA JFE ERROR
%s",rep.exceptionReason.c_str());
@@ -230,9 +230,9 @@
NM_Get_FED_File repFED ;
repFED.federate = num_federe ;
repFED.federation = num_federation ;
- repFED.number = 0 ;
+ repFED.setLineno(0);
repFED.setFEDid(filename);
- repFED.exception = e ;
+ repFED.setException(e);
// Send answer
D.Out(pdTrace,"send NetworkMessage of Type %d after open \"%s\"",
repFED.getType(),repFED.getFEDid().c_str());
@@ -246,7 +246,7 @@
NM_Get_FED_File msg ;
D.Out(pdTrace,"wait NetworkMessage of Type %d",msg.getType());
msg.receive(link,NM_msgBufReceive);
- assert ( msg.number == 0 );
+ assert ( msg.getLineno() == 0 );
// RTIA has opened working file then RTIG has to transfer file contents
// line by line
std::string fileLine;
@@ -258,10 +258,10 @@
std::getline(fedFile,fileLine);
fileLine = fileLine+"\n";
// RTIG sends line to RTIA and number gives line number
- repFED.exception = e_NO_EXCEPTION ;
+ repFED.setException(e_NO_EXCEPTION);
repFED.federate = num_federe ;
repFED.federation = num_federation ;
- repFED.number = num_line ;
+ repFED.setLineno(num_line);
repFED.setFEDid(filename);
// line transfered
repFED.setFEDLine(fileLine);
@@ -270,15 +270,15 @@
// Wait for OK from RTIA
msg.receive(link,NM_msgBufReceive);
- assert ( msg.number == num_line );
+ assert ( msg.getLineno() == num_line );
}
// close
fedFile.close();
- repFED.exception = e_NO_EXCEPTION ;
+ repFED.setException(e_NO_EXCEPTION);
repFED.federate = num_federe ;
repFED.federation = num_federation ;
- repFED.number = 0 ;
+ repFED.setLineno(0) ;
repFED.setFEDid(filename);
// Send answer
@@ -362,24 +362,24 @@
{ printf("ERROR : %s reason : %s\n",e._name,e._reason.c_str());
if (strcmp(e._name,"RTIinternalError")==0 )
{
- rep.exception = e_RTIinternalError;
+ rep.setException(e_RTIinternalError);
rep.exceptionReason = e._reason;
}
else if (strcmp(e._name,"FederationExecutionDoesNotExist")==0 )
{
- rep.exception = e_FederationExecutionDoesNotExist;
+ rep.setException(e_FederationExecutionDoesNotExist);
rep.exceptionReason =e._reason;
}
else if (strcmp(e._name,"FederatesCurrentlyJoined")==0 )
{
- rep.exception = e_FederatesCurrentlyJoined;
+ rep.setException(e_FederatesCurrentlyJoined);
rep.exceptionReason = "at least one federate joined";
}
}
rep.federate = req->federate ;
rep.setFederationName(req->getFederationName());
- if ( rep.exception == e_NO_EXCEPTION )
+ if ( rep.getException() == e_NO_EXCEPTION )
{
auditServer << "Federation Name \"" << federation.c_str() <<
"\"("<<num_federation<<") destroyed." ;
}
@@ -1517,7 +1517,7 @@
auditServer << "ObjID = " << request->object ;
// We have to do verifications about this object and we need owner
- answer.exception = e_NO_EXCEPTION ;
+ answer.setException(e_NO_EXCEPTION);
try
{
federateOwner = federations.requestObjectOwner(request->federation,
@@ -1528,17 +1528,17 @@
}
catch (ObjectNotKnown e)
{
- answer.exception = e_ObjectNotKnown ;
+ answer.setException(e_ObjectNotKnown);
answer.exceptionReason = e._reason ;
}
catch (FederationExecutionDoesNotExist e)
{
- answer.exception = e_FederationExecutionDoesNotExist ;
+ answer.setException(e_FederationExecutionDoesNotExist);
answer.exceptionReason = e._reason ;
}
catch (RTIinternalError e)
{
- answer.exception = e_RTIinternalError ;
+ answer.setException(e_RTIinternalError);
answer.exceptionReason = e._reason ;
}
@@ -1552,4 +1552,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.84 2009/09/14 17:54:09 erk Exp $
+// $Id: RTIG_processing.cc,v 3.85 2009/09/14 21:21:32 erk Exp $
Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.56
retrieving revision 3.57
diff -u -b -r3.56 -r3.57
--- RTIG/RTIG.cc 14 Sep 2009 17:54:09 -0000 3.56
+++ RTIG/RTIG.cc 14 Sep 2009 21:21:32 -0000 3.57
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: RTIG.cc,v 3.56 2009/09/14 17:54:09 erk Exp $
+// $Id: RTIG.cc,v 3.57 2009/09/14 21:21:32 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -585,327 +585,327 @@
catch (ArrayIndexOutOfBounds &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_ArrayIndexOutOfBounds ;
+ rep->setException(e_ArrayIndexOutOfBounds);
}
catch (AttributeAlreadyOwned &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_AttributeAlreadyOwned ;
+ rep->setException(e_AttributeAlreadyOwned);
}
catch (AttributeAlreadyBeingAcquired &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_AttributeAlreadyBeingAcquired ;
+ rep->setException(e_AttributeAlreadyBeingAcquired);
}
catch (AttributeAlreadyBeingDivested &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_AttributeAlreadyBeingDivested ;
+ rep->setException(e_AttributeAlreadyBeingDivested);
}
catch (AttributeDivestitureWasNotRequested &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_AttributeDivestitureWasNotRequested ;
+ rep->setException(e_AttributeDivestitureWasNotRequested);
}
catch (AttributeAcquisitionWasNotRequested &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_AttributeAcquisitionWasNotRequested ;
+ rep->setException(e_AttributeAcquisitionWasNotRequested);
}
catch (AttributeNotDefined &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_AttributeNotDefined ;
+ rep->setException(e_AttributeNotDefined);
}
catch (AttributeNotKnown &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_AttributeNotKnown ;
+ rep->setException(e_AttributeNotKnown);
}
catch (AttributeNotOwned &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_AttributeNotOwned ;
+ rep->setException(e_AttributeNotOwned);
}
catch (AttributeNotPublished &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_AttributeNotPublished ;
+ rep->setException(e_AttributeNotPublished);
}
catch (AttributeNotSubscribed &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_AttributeNotSubscribed ;
+ rep->setException(e_AttributeNotSubscribed);
}
catch (ConcurrentAccessAttempted &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_ConcurrentAccessAttempted ;
+ rep->setException(e_ConcurrentAccessAttempted);
}
catch (CouldNotDiscover &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_CouldNotDiscover ;
+ rep->setException(e_CouldNotDiscover);
}
catch (CouldNotOpenRID &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_CouldNotOpenRID ;
+ rep->setException(e_CouldNotOpenRID);
}
catch (CouldNotOpenFED &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_CouldNotOpenFED ;
+ rep->setException(e_CouldNotOpenFED);
}
catch (CouldNotRestore &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_CouldNotRestore ;
+ rep->setException(e_CouldNotRestore);
}
catch (DeletePrivilegeNotHeld &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_DeletePrivilegeNotHeld ;
+ rep->setException(e_DeletePrivilegeNotHeld);
}
catch (ErrorReadingRID &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_ErrorReadingRID ;
+ rep->setException(e_ErrorReadingRID);
}
catch (EventNotKnown &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_EventNotKnown ;
+ rep->setException(e_EventNotKnown);
}
catch (FederateAlreadyPaused &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederateAlreadyPaused ;
+ rep->setException(e_FederateAlreadyPaused);
}
catch (FederateAlreadyExecutionMember &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederateAlreadyExecutionMember ;
+ rep->setException(e_FederateAlreadyExecutionMember);
}
catch (FederateDoesNotExist &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederateDoesNotExist ;
+ rep->setException(e_FederateDoesNotExist);
}
catch (FederateInternalError &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederateInternalError ;
+ rep->setException(e_FederateInternalError);
}
catch (FederateNameAlreadyInUse &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederateNameAlreadyInUse ;
+ rep->setException(e_FederateNameAlreadyInUse);
}
catch (FederateNotExecutionMember &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederateNotExecutionMember ;
+ rep->setException(e_FederateNotExecutionMember);
}
catch (FederateNotPaused &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederateNotPaused ;
+ rep->setException(e_FederateNotPaused);
}
catch (FederateNotPublishing &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederateNotPublishing ;
+ rep->setException(e_FederateNotPublishing);
}
catch (FederateNotSubscribing &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederateNotSubscribing ;
+ rep->setException(e_FederateNotSubscribing);
}
catch (FederateOwnsAttributes &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederateOwnsAttributes ;
+ rep->setException(e_FederateOwnsAttributes);
}
catch (FederatesCurrentlyJoined &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederatesCurrentlyJoined ;
+ rep->setException(e_FederatesCurrentlyJoined);
}
catch (FederateWasNotAskedToReleaseAttribute &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederateWasNotAskedToReleaseAttribute ;
+ rep->setException(e_FederateWasNotAskedToReleaseAttribute);
}
catch (FederationAlreadyPaused &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederationAlreadyPaused ;
+ rep->setException(e_FederationAlreadyPaused);
}
catch (FederationExecutionAlreadyExists &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederationExecutionAlreadyExists ;
+ rep->setException(e_FederationExecutionAlreadyExists);
}
catch (FederationExecutionDoesNotExist &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederationExecutionDoesNotExist ;
+ rep->setException(e_FederationExecutionDoesNotExist);
}
catch (FederationNotPaused &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederationNotPaused ;
+ rep->setException(e_FederationNotPaused);
}
catch (FederationTimeAlreadyPassed &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_FederationTimeAlreadyPassed ;
+ rep->setException(e_FederationTimeAlreadyPassed);
}
catch (IDsupplyExhausted &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_IDsupplyExhausted ;
+ rep->setException(e_IDsupplyExhausted);
}
catch (InteractionClassNotDefined &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InteractionClassNotDefined ;
+ rep->setException(e_InteractionClassNotDefined);
}
catch (InteractionClassNotKnown &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InteractionClassNotKnown ;
+ rep->setException(e_InteractionClassNotKnown);
}
catch (InteractionClassNotPublished &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InteractionClassNotPublished ;
+ rep->setException(e_InteractionClassNotPublished);
}
catch (InteractionParameterNotDefined &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InteractionParameterNotDefined ;
+ rep->setException(e_InteractionParameterNotDefined);
}
catch (InteractionParameterNotKnown &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InteractionParameterNotKnown ;
+ rep->setException(e_InteractionParameterNotKnown);
}
catch (InvalidDivestitureCondition &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidDivestitureCondition ;
+ rep->setException(e_InvalidDivestitureCondition);
}
catch (InvalidExtents &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidExtents ;
+ rep->setException(e_InvalidExtents);
}
catch (InvalidFederationTime &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidFederationTime ;
+ rep->setException(e_InvalidFederationTime);
}
catch (InvalidFederationTimeDelta &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidFederationTimeDelta ;
+ rep->setException(e_InvalidFederationTimeDelta);
}
catch (InvalidObjectHandle &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidObjectHandle ;
+ rep->setException(e_InvalidObjectHandle);
}
catch (InvalidOrderingHandle &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidOrderingHandle ;
+ rep->setException(e_InvalidOrderingHandle);
}
catch (InvalidResignAction &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidResignAction ;
+ rep->setException(e_InvalidResignAction);
}
catch (InvalidRetractionHandle &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidRetractionHandle ;
+ rep->setException(e_InvalidRetractionHandle);
}
catch (InvalidRoutingSpace &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidRoutingSpace ;
+ rep->setException(e_InvalidRoutingSpace);
}
catch (InvalidTransportationHandle &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_InvalidTransportationHandle ;
+ rep->setException(e_InvalidTransportationHandle);
}
catch (MemoryExhausted &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_MemoryExhausted ;
+ rep->setException(e_MemoryExhausted);
}
catch (NameNotFound &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_NameNotFound ;
+ rep->setException(e_NameNotFound);
}
catch (NoPauseRequested &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_NoPauseRequested ;
+ rep->setException(e_NoPauseRequested);
}
catch (NoResumeRequested &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_NoResumeRequested ;
+ rep->setException(e_NoResumeRequested);
}
catch (ObjectClassNotDefined &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_ObjectClassNotDefined ;
+ rep->setException(e_ObjectClassNotDefined);
}
catch (ObjectClassNotKnown &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_ObjectClassNotKnown ;
+ rep->setException(e_ObjectClassNotKnown);
}
catch (ObjectClassNotPublished &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_ObjectClassNotPublished ;
+ rep->setException(e_ObjectClassNotPublished);
}
catch (ObjectClassNotSubscribed &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_ObjectClassNotSubscribed ;
+ rep->setException(e_ObjectClassNotSubscribed);
}
catch (ObjectNotKnown &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_ObjectNotKnown ;
+ rep->setException(e_ObjectNotKnown);
}
catch (ObjectAlreadyRegistered &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_ObjectAlreadyRegistered ;
+ rep->setException(e_ObjectAlreadyRegistered);
}
catch (RegionNotKnown &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_RegionNotKnown ;
+ rep->setException(e_RegionNotKnown);
}
catch (RestoreInProgress &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_RestoreInProgress ;
+ rep->setException(e_RestoreInProgress);
}
catch (RestoreNotRequested &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_RestoreNotRequested ;
+ rep->setException(e_RestoreNotRequested);
}
catch (RTIinternalError &e) {
if (e._reason.empty())
@@ -913,78 +913,78 @@
else
D.Out(pdExcept, "Catching \"%s\" exception: %s.", e._name,
e._reason.c_str());
CPY_NOT_NULL(e);
- rep->exception = e_RTIinternalError ;
+ rep->setException(e_RTIinternalError);
}
catch (SaveInProgress &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_SaveInProgress ;
+ rep->setException(e_SaveInProgress);
}
catch (SaveNotInitiated &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_SaveNotInitiated ;
+ rep->setException(e_SaveNotInitiated);
}
catch (SecurityError &e) {
cout << endl << "Security Error : " << e._reason << endl ;
CPY_NOT_NULL(e);
- rep->exception = e_SecurityError ;
+ rep->setException(e_SecurityError);
}
catch (SpaceNotDefined &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_SpaceNotDefined ;
+ rep->setException(e_SpaceNotDefined);
}
catch (SpecifiedSaveLabelDoesNotExist &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_SpecifiedSaveLabelDoesNotExist ;
+ rep->setException(e_SpecifiedSaveLabelDoesNotExist);
}
catch (TimeAdvanceAlreadyInProgress &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_TimeAdvanceAlreadyInProgress ;
+ rep->setException(e_TimeAdvanceAlreadyInProgress);
}
catch (TimeAdvanceWasNotInProgress &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_TimeAdvanceWasNotInProgress ;
+ rep->setException(e_TimeAdvanceWasNotInProgress);
}
catch (TooManyIDsRequested &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_TooManyIDsRequested ;
+ rep->setException(e_TooManyIDsRequested);
}
catch (UnableToPerformSave &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_UnableToPerformSave ;
+ rep->setException(e_UnableToPerformSave);
}
catch (UnimplementedService &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_UnimplementedService ;
+ rep->setException(e_UnimplementedService);
}
catch (UnknownLabel &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_UnknownLabel ;
+ rep->setException(e_UnknownLabel);
}
catch (ValueCountExceeded &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_ValueCountExceeded ;
+ rep->setException(e_ValueCountExceeded);
}
catch (ValueLengthExceeded &e) {
D.Out(pdExcept, "Catching \"%s\" exception.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_ValueLengthExceeded ;
+ rep->setException(e_ValueLengthExceeded);
}
// Non RTI specific exception, Client connection problem(internal)
catch (NetworkError &e) {
strcpy(buffer, " - NetworkError");
- auditServer.endLine(rep->exception, buffer);
+ auditServer.endLine(rep->getException(), buffer);
delete msg;
throw e ;
}
@@ -992,29 +992,29 @@
catch (Exception &e) {
D.Out(pdExcept, "Unknown Exception : %s.", e._name);
CPY_NOT_NULL(e);
- rep->exception = e_RTIinternalError ;
+ rep->setException(e_RTIinternalError);
}
// buffer may contain an exception reason. If not, set it to OK
// or Exception
if (strlen(buffer)== 0) {
- if (rep->exception == e_NO_EXCEPTION)
+ if (rep->getException() == e_NO_EXCEPTION)
strcpy(buffer, " - OK");
else
strcpy(buffer, " - Exception");
}
- auditServer.endLine(rep->exception, buffer);
+ auditServer.endLine(rep->getException(), buffer);
delete msg;
if (link == NULL) return link ;
/* FIXME ***/
- if (rep->exception != e_NO_EXCEPTION) {
+ if (rep->getException() != e_NO_EXCEPTION) {
G.Out(pdGendoc," processIncomingMessage ===> write on
exception to RTIA");
rep->send(link,NM_msgBufSend);
D.Out(pdExcept,
"RTIG catched exception %d and sent it back to federate %d.",
- rep->exception, rep->federate);
+ rep->getException(), rep->federate);
}
G.Out(pdGendoc,"exit RTIG::processIncomingMessage");
return link ;
@@ -1035,4 +1035,4 @@
}} // namespace certi/rtig
-// $Id: RTIG.cc,v 3.56 2009/09/14 17:54:09 erk Exp $
+// $Id: RTIG.cc,v 3.57 2009/09/14 21:21:32 erk Exp $
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.60
retrieving revision 3.61
diff -u -b -r3.60 -r3.61
--- RTIA/ObjectManagement.cc 8 Apr 2009 10:47:17 -0000 3.60
+++ RTIA/ObjectManagement.cc 14 Sep 2009 21:21:32 -0000 3.61
@@ -96,7 +96,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::REGISTER_OBJECT, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
if (e == e_NO_EXCEPTION) {
rootObject->registerObjectInstance(fm->federate, the_class,
rep->object,
@@ -156,7 +156,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage> rep(comm->waitMessage(req.getType(),
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
evtrHandle = rep->eventRetraction;
}
else {
@@ -216,7 +216,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage> rep(comm->waitMessage(req.getType(),
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
G.Out(pdGendoc,"exit ObjectManagement::updateAttributeValues without
time");
}
@@ -359,7 +359,7 @@
// Send network message and then wait for answer.
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::SEND_INTERACTION, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
evtrHandle = rep->eventRetraction;
}
else {
@@ -409,7 +409,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::SEND_INTERACTION, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of sendInteraction */
@@ -476,7 +476,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DELETE_OBJECT, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
if (e == e_NO_EXCEPTION) {
rootObject->deleteObjectInstance(fm->federate, theObjectHandle,
theTag);
@@ -502,7 +502,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DELETE_OBJECT, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
if (e == e_NO_EXCEPTION) {
rootObject->deleteObjectInstance(fm->federate, theObjectHandle,
theTag);
@@ -581,7 +581,7 @@
NetworkMessage::CHANGE_ATTRIBUTE_TRANSPORT_TYPE,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
return rep->eventRetraction ;
}
@@ -613,7 +613,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::CHANGE_ATTRIBUTE_ORDER_TYPE,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
return rep->eventRetraction ;
}
@@ -634,7 +634,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::CHANGE_INTERACTION_TRANSPORT_TYPE,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
return rep->eventRetraction ;
}
@@ -657,7 +657,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::CHANGE_INTERACTION_ORDER_TYPE,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
return rep->eventRetraction ;
} /* end of changeInteractionOrderType */
@@ -687,7 +687,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::REQUEST_OBJECT_ATTRIBUTE_VALUE_UPDATE,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
G.Out(pdGendoc,"exit
ObjectManagement::requestObjectAttributeValueUpdate");
} /* end of requestObjectAttributeValueUpdate */
Index: RTIA/DeclarationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/DeclarationManagement.cc,v
retrieving revision 3.26
retrieving revision 3.27
diff -u -b -r3.26 -r3.27
--- RTIA/DeclarationManagement.cc 8 Apr 2009 10:47:17 -0000 3.26
+++ RTIA/DeclarationManagement.cc 14 Sep 2009 21:21:32 -0000 3.27
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: DeclarationManagement.cc,v 3.26 2009/04/08 10:47:17 approx Exp $
+// $Id: DeclarationManagement.cc,v 3.27 2009/09/14 21:21:32 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -105,7 +105,7 @@
// Reception
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::PUBLISH_OBJECT_CLASS, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
G.Out(pdGendoc,"exit DeclarationManagement::publishObjectClass") ;
} /* end of publishObjectClass */
@@ -149,7 +149,7 @@
// On attend une reponse
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::UNPUBLISH_OBJECT_CLASS, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of unpublishObjectClass */
// ----------------------------------------------------------------------------
@@ -181,7 +181,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::PUBLISH_INTERACTION_CLASS, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of publishInteractionClass */
// ----------------------------------------------------------------------------
@@ -214,7 +214,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::UNPUBLISH_INTERACTION_CLASS,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of unpublishInteractionClass */
// ----------------------------------------------------------------------------
@@ -252,7 +252,7 @@
req.federate));
G.Out(pdGendoc," =====> received S_O_C from
RTIG");
- e = rep->exception ;
+ e = rep->getException() ;
G.Out(pdGendoc,"exit
DeclarationManagement::subscribeObjectClassAttribute");
} /* end of subscribeObjectClassAttribute */
@@ -280,7 +280,7 @@
NetworkMessage::UNSUBSCRIBE_OBJECT_CLASS,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of unsubscribeObjectClassAttribute */
// ----------------------------------------------------------------------------
@@ -316,7 +316,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::SUBSCRIBE_INTERACTION_CLASS,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of subscribeInteractionClass */
// ----------------------------------------------------------------------------
@@ -353,7 +353,7 @@
NetworkMessage::UNSUBSCRIBE_INTERACTION_CLASS,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of unsubscribeInteractionClass */
void
@@ -499,4 +499,4 @@
}} // namespace certi/rtia
-// $Id: DeclarationManagement.cc,v 3.26 2009/04/08 10:47:17 approx Exp $
+// $Id: DeclarationManagement.cc,v 3.27 2009/09/14 21:21:32 erk Exp $
Index: RTIA/DataDistribution.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/DataDistribution.cc,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -b -r3.27 -r3.28
--- RTIA/DataDistribution.cc 8 Nov 2008 11:36:05 -0000 3.27
+++ RTIA/DataDistribution.cc 14 Sep 2009 21:21:32 -0000 3.28
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: DataDistribution.cc,v 3.27 2008/11/08 11:36:05 erk Exp $
+// $Id: DataDistribution.cc,v 3.28 2009/09/14 21:21:32 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -133,7 +133,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DDM_CREATE_REGION, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
if (e == e_NO_EXCEPTION) {
D[pdDebug] << "Create region " << rep->region << endl ;
@@ -173,7 +173,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DDM_MODIFY_REGION, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
if (e == e_NO_EXCEPTION) {
region->replaceExtents(extents);
@@ -202,7 +202,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DDM_DELETE_REGION, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
if (e == e_NO_EXCEPTION) {
rootObject->deleteRegion(handle);
@@ -242,7 +242,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DDM_ASSOCIATE_REGION,req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of associateRegion */
@@ -270,7 +270,7 @@
comm->sendMessage(&req);
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DDM_REGISTER_OBJECT,req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
if (e == e_NO_EXCEPTION) {
rootObject->registerObjectInstance(fm->federate, class_handle,
rep->object,
@@ -312,7 +312,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DDM_UNASSOCIATE_REGION,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of unassociateRegion */
// ----------------------------------------------------------------------------
@@ -339,7 +339,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DDM_SUBSCRIBE_ATTRIBUTES,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of subscribe */
// ----------------------------------------------------------------------------
@@ -364,7 +364,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DDM_UNSUBSCRIBE_ATTRIBUTES,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of unsubscribeAttributes */
// ----------------------------------------------------------------------------
@@ -386,7 +386,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DDM_SUBSCRIBE_INTERACTION,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of subscribeInteraction */
// ----------------------------------------------------------------------------
@@ -408,9 +408,9 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::DDM_UNSUBSCRIBE_INTERACTION,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
} /* end of unsubscribeInteraction */
}} // namespace certi::rtia
-// $Id: DataDistribution.cc,v 3.27 2008/11/08 11:36:05 erk Exp $
+// $Id: DataDistribution.cc,v 3.28 2009/09/14 21:21:32 erk Exp $
Index: RTIA/FederationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.cc,v
retrieving revision 3.70
retrieving revision 3.71
diff -u -b -r3.70 -r3.71
--- RTIA/FederationManagement.cc 14 Sep 2009 17:54:09 -0000 3.70
+++ RTIA/FederationManagement.cc 14 Sep 2009 21:21:32 -0000 3.71
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: FederationManagement.cc,v 3.70 2009/09/14 17:54:09 erk Exp $
+// $Id: FederationManagement.cc,v 3.71 2009/09/14 21:21:32 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -144,37 +144,37 @@
// We have to see if C_F_E is OK.
- if (reponse->exception == e_NO_EXCEPTION)
+ if (reponse->getException() == e_NO_EXCEPTION)
{
_nom_federation = std::string(theName);
_numero_federation = reponse->federation ;
D.Out(pdInit, "est createur");
}
- else if (reponse->exception == e_CouldNotOpenFED)
+ else if (reponse->getException() == e_CouldNotOpenFED)
// RTIG encounters a problem creating federation execution
{
- e = reponse->exception;
+ e = reponse->getException();
G.Out(pdGendoc,"exit FederationManagement::"
"createFederationExecution on exception");
throw CouldNotOpenFED (reponse->exceptionReason.c_str()) ;
}
- else if (reponse->exception == e_FederationExecutionAlreadyExists)
+ else if (reponse->getException() == e_FederationExecutionAlreadyExists)
{
- e = reponse->exception;
+ e = reponse->getException();
G.Out(pdGendoc,"exit FederationManagement::"
"createFederationExecution on exception");
throw FederationExecutionAlreadyExists
(reponse->exceptionReason.c_str()) ;
}
- else if (reponse->exception == e_ErrorReadingFED)
+ else if (reponse->getException() == e_ErrorReadingFED)
{
- e = reponse->exception;
+ e = reponse->getException();
G.Out(pdGendoc,"exit FederationManagement::"
"createFederationExecution on exception
ErrorReadingFED");
throw ErrorReadingFED (reponse->exceptionReason.c_str()) ;
}
else
{
- e = reponse->exception ;
+ e = reponse->getException() ;
G.Out(pdGendoc,"exit FederationManagement::"
"createFederationExecution on exception
RTIinternalError");
throw RTIinternalError (reponse->exceptionReason.c_str()) ;
@@ -219,7 +219,7 @@
NetworkMessage::DESTROY_FEDERATION_EXECUTION,
federate));
- if (reponse->exception == e_NO_EXCEPTION) {
+ if (reponse->getException() == e_NO_EXCEPTION) {
_nom_federation = "" ;
_numero_federation = 0 ;
_fin_execution = true ;
@@ -246,7 +246,7 @@
else
{
// There is an exception so destroy may be not done on RTIG
- e = reponse->exception ;
+ e = reponse->getException() ;
}
}
@@ -294,10 +294,10 @@
std::auto_ptr<NetworkMessage>
reponse(comm->waitMessage(NetworkMessage::GET_FED_FILE, 0));
NM_Get_FED_File* getFedMsg =
static_cast<NM_Get_FED_File*>(reponse.get());
- if ( reponse->exception != e_NO_EXCEPTION)
+ if ( reponse->getException() != e_NO_EXCEPTION)
{
// Bad answer from RTIG
- e = reponse->exception ;
+ e = reponse->getException() ;
}
else
{
@@ -347,9 +347,9 @@
requeteFED.setFederateName(Federate);
requeteFED.setFEDid(filename);
if ( e == e_NO_EXCEPTION)
- requeteFED.number = 0 ; // OK for open
+ requeteFED.setLineno(0); // OK for open
else
- requeteFED.number = 1 ;
+ requeteFED.setLineno(1);
G.Out(pdGendoc,"joinFederationExecution====> begin FED file get
from RTIG");
@@ -361,7 +361,7 @@
{
reponse.reset(comm->waitMessage(NetworkMessage::GET_FED_FILE,
0));
getFedMsg = static_cast<NM_Get_FED_File*>(reponse.get());
- if ( reponse->exception != e_NO_EXCEPTION)
+ if ( reponse->getException() != e_NO_EXCEPTION)
{
cout << "Bad answer from RTIG" << endl ;
e = e_RTIinternalError ;
@@ -371,14 +371,14 @@
// Line read
num_line++ ;
// Check for EOF
- if ( reponse->number == 0 ) break;
+ if ( getFedMsg->getLineno() == 0 ) break;
- assert ( num_line == reponse->number ) ;
+ assert ( num_line == getFedMsg->getLineno() ) ;
reponse->handleArraySize = 1 ;
fedWorkFile << getFedMsg->getFEDLine();
// RTIA says OK to RTIG
requeteFED.setFederateName(Federate);
- requeteFED.number = num_line ;
+ requeteFED.setLineno(num_line);
requeteFED.setFEDid(filename);
comm->sendMessage(&requeteFED);
}
@@ -393,7 +393,7 @@
// If OK, regulators number is inside the answer.
// Then we except a NULL message from each.
- if (reponse->exception == e_NO_EXCEPTION) {
+ if (reponse->getException() == e_NO_EXCEPTION) {
_nom_federation = std::string(Federation);
_nom_federe = std::string(Federate);
_numero_federation = reponse->federation ;
@@ -417,7 +417,7 @@
return(federate);
}
else
- e = reponse->exception ;
+ e = reponse->getException() ;
}
G.Out(pdGendoc,"exit(0) FederationManagement::joinFederationExecution");
return(0);
Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.49
retrieving revision 3.50
diff -u -b -r3.49 -r3.50
--- RTIA/TimeManagement.cc 4 Jun 2009 11:31:50 -0000 3.49
+++ RTIA/TimeManagement.cc 14 Sep 2009 21:21:32 -0000 3.50
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: TimeManagement.cc,v 3.49 2009/06/04 11:31:50 erk Exp $
+// $Id: TimeManagement.cc,v 3.50 2009/09/14 21:21:32 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -168,7 +168,7 @@
msg.getLabel().c_str(),
msg.getDate(),
msg.eventRetraction,
- msg.exception);
+ msg.getRefException());
}
catch (RTIinternalError &e) {
@@ -189,14 +189,14 @@
msg.getDate(),
msg.getLabel().c_str(),
msg.eventRetraction,
- msg.exception);
+ msg.getRefException());
else
om->reflectAttributeValues(msg.object,
msg.handleArray,
ValueArray,
msg.handleArraySize,
msg.getLabel().c_str(),
- msg.exception);
+ msg.getRefException());
ValueArray.empty();
break ;
}
@@ -206,7 +206,7 @@
om->provideAttributeValueUpdate(msg.object,
msg.handleArray,
msg.handleArraySize,
- msg.exception);
+ msg.getRefException());
break;
}
@@ -223,14 +223,14 @@
msg.getDate(),
msg.getLabel().c_str(),
msg.eventRetraction,
- msg.exception);
+ msg.getRefException());
else
om->receiveInteraction(msg.interactionClass,
msg.handleArray,
ValueArray,
msg.handleArraySize,
msg.getLabel().c_str(),
- msg.exception);
+ msg.getRefException());
ValueArray.empty();
break ;
@@ -243,13 +243,13 @@
msg.getDate(),
msg.getLabel().c_str(),
msg.eventRetraction,
- msg.exception);
+ msg.getRefException());
}
else {
om->removeObject(msg.object,
msg.federate,
msg.getLabel().c_str(),
- msg.exception);
+ msg.getRefException());
}
break ;
@@ -260,14 +260,14 @@
owm->informAttributeOwnership(msg.object,
msg.handleArray[0],
msg.federate,
- msg.exception);
+ msg.getRefException());
break ;
case NetworkMessage::ATTRIBUTE_IS_NOT_OWNED:
owm->attributeIsNotOwned(msg.object,
msg.handleArray[0],
msg.federate,
- msg.exception);
+ msg.getRefException());
break ;
case NetworkMessage::REQUEST_ATTRIBUTE_OWNERSHIP_ASSUMPTION:
@@ -277,7 +277,7 @@
msg.handleArraySize,
msg.federate,
const_cast<char*>(msg.getLabel().c_str()),
- msg.exception);
+ msg.getRefException());
break ;
}
@@ -287,7 +287,7 @@
msg.handleArray,
msg.handleArraySize,
msg.federate,
- msg.exception);
+ msg.getRefException());
break ;
}
@@ -297,7 +297,7 @@
msg.handleArray,
msg.handleArraySize,
msg.federate,
- msg.exception);
+ msg.getRefException());
break ;
}
@@ -306,7 +306,7 @@
owm->attributeOwnershipDivestitureNotification(msg.object,
msg.handleArray,
msg.handleArraySize,
- msg.exception);
+ msg.getRefException());
break ;
}
@@ -316,7 +316,7 @@
msg.handleArray,
msg.handleArraySize,
const_cast<char*>(msg.getLabel().c_str()),
- msg.exception);
+ msg.getRefException());
break ;
}
@@ -325,7 +325,7 @@
owm->confirmAttributeOwnershipAcquisitionCancellation(msg.object,
msg.handleArray,
msg.handleArraySize,
- msg.exception);
+
msg.getRefException());
break ;
}
@@ -363,13 +363,13 @@
}
break ;
case NetworkMessage::TIME_REGULATION_ENABLED:
- this->timeRegulationEnabled(msg.getDate(), msg.exception);
+ this->timeRegulationEnabled(msg.getDate(), msg.getRefException());
break;
case NetworkMessage::TIME_CONSTRAINED_ENABLED:
- this->timeConstrainedEnabled(msg.getDate(), msg.exception);
+ this->timeConstrainedEnabled(msg.getDate(), msg.getRefException());
break;
case NetworkMessage::START_REGISTRATION_FOR_OBJECT_CLASS:
- dm->startRegistrationForObjectClass(msg.objectClass, msg.exception);
+ dm->startRegistrationForObjectClass(msg.objectClass,
msg.getRefException());
break;
default:
@@ -496,7 +496,9 @@
if (heure_logique < _heure_courante)
e = e_FederationTimeAlreadyPassed ;
-// Fix bug #25497
+// This is check may be overkill because
+// if we consider that advancing in time is NOT a timestamped event
+// see bug #25497 : https://savannah.nongnu.org/bugs/?25497
// if (heure_logique < _heure_courante + _lookahead_courant)
// e = e_InvalidFederationTime ;
@@ -533,7 +535,9 @@
if (heure_logique < _heure_courante)
e = e_FederationTimeAlreadyPassed ;
-// Fix bug #25497
+// This is check may be overkill because
+// if we consider that advancing in time is NOT a timestamped event
+// see bug #25497 : https://savannah.nongnu.org/bugs/?25497
// if (heure_logique < _heure_courante + _lookahead_courant)
// e = e_InvalidFederationTime ;
@@ -922,7 +926,9 @@
if (logical_time < _heure_courante)
e = e_FederationTimeAlreadyPassed ;
-// Fix bug #25497
+ // This is check may be overkill because
+ // if we consider that advancing in time is NOT a timestamped event
+ // see bug #25497 : https://savannah.nongnu.org/bugs/?25497
// if (logical_time < _heure_courante + _lookahead_courant) {
//
// D.Out(pdDebug,"InvalidFederation time lkahead=%f, current=%f,
requested=%f",
@@ -968,7 +974,9 @@
if (logical_time < _heure_courante)
e = e_FederationTimeAlreadyPassed ;
-// Fix bug #25497
+ // This is check may be overkill because
+ // if we consider that advancing in time is NOT a timestamped event
+ // see bug #25497 : https://savannah.nongnu.org/bugs/?25497
// if (logical_time < _heure_courante + _lookahead_courant)
// e = e_InvalidFederationTime ;
@@ -993,4 +1001,4 @@
}} // namespaces
-// $Id: TimeManagement.cc,v 3.49 2009/06/04 11:31:50 erk Exp $
+// $Id: TimeManagement.cc,v 3.50 2009/09/14 21:21:32 erk Exp $
Index: RTIA/OwnershipManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/OwnershipManagement.cc,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- RTIA/OwnershipManagement.cc 7 Dec 2008 20:16:09 -0000 3.17
+++ RTIA/OwnershipManagement.cc 14 Sep 2009 21:21:32 -0000 3.18
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: OwnershipManagement.cc,v 3.17 2008/12/07 20:16:09 gotthardp Exp $
+// $Id: OwnershipManagement.cc,v 3.18 2009/09/14 21:21:32 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -87,7 +87,7 @@
NetworkMessage::IS_ATTRIBUTE_OWNED_BY_FEDERATE,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
if (e == e_NO_EXCEPTION)
return(rep->getLabel().c_str());
@@ -122,7 +122,7 @@
//AttendreMsg ne sert que pour verifier que la transmission a ete OK
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::QUERY_ATTRIBUTE_OWNERSHIP, req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
}
// ----------------------------------------------------------------------------
@@ -156,7 +156,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
}
// ----------------------------------------------------------------------------
@@ -188,7 +188,7 @@
NetworkMessage::CANCEL_NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
}
// ----------------------------------------------------------------------------
@@ -218,7 +218,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::ATTRIBUTE_OWNERSHIP_ACQUISITION_IF_AVAILABLE,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
}
// ----------------------------------------------------------------------------
@@ -249,7 +249,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::UNCONDITIONAL_ATTRIBUTE_OWNERSHIP_DIVESTITURE,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
}
// ----------------------------------------------------------------------------
@@ -282,7 +282,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::ATTRIBUTE_OWNERSHIP_ACQUISITION,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
}
// ----------------------------------------------------------------------------
@@ -315,7 +315,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::ATTRIBUTE_OWNERSHIP_RELEASE_RESPONSE,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
if (e == e_NO_EXCEPTION) {
AttributeHandleSet *AttributeSet ;
@@ -358,7 +358,7 @@
std::auto_ptr<NetworkMessage>
rep(comm->waitMessage(NetworkMessage::CANCEL_ATTRIBUTE_OWNERSHIP_ACQUISITION,
req.federate));
- e = rep->exception ;
+ e = rep->getException() ;
}
// ----------------------------------------------------------------------------
@@ -514,4 +514,4 @@
}} // namespace certi/rtia
-// $Id: OwnershipManagement.cc,v 3.17 2008/12/07 20:16:09 gotthardp Exp $
+// $Id: OwnershipManagement.cc,v 3.18 2009/09/14 21:21:32 erk Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libCERTI/Interaction.cc libCERTI/ObjectCl...,
certi-cvs <=