[certi-cvs] certi RTIA/FederationManagement.cc RTIG/RTIG.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     ROUSSELOT <rousse>      08/03/07 16:10:07

Modified files:
        RTIA           : FederationManagement.cc 
        RTIG           : RTIG.cc 

Log message:
        Bug #22509 about destroy federation execution corrected

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.cc?cvsroot=certi&r1=3.47&r2=3.48
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&r1=3.35&r2=3.36

Patches:
Index: RTIA/FederationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.cc,v
retrieving revision 3.47
retrieving revision 3.48
diff -u -b -r3.47 -r3.48
--- RTIA/FederationManagement.cc        22 Feb 2008 11:34:30 -0000      3.47
+++ RTIA/FederationManagement.cc        7 Mar 2008 16:10:06 -0000       3.48
@@ -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.47 2008/02/22 11:34:30 siron Exp $
+// $Id: FederationManagement.cc,v 3.48 2008/03/07 16:10:06 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -224,6 +224,7 @@
         strcpy(requete.federationName, theName);
 
         G.Out(pdGendoc,"destroyFederationExecution====>send Message to RTIG");
+
         comm->sendMessage(&requete);
 
         comm->waitMessage(&reponse,
@@ -236,15 +237,19 @@
             _est_createur_federation = false ;
             _fin_execution = true ;
             // Now, remove temporary file (if not yet done)
+            if ( _FEDid != NULL )
+               {
             if ( _FEDid[0] != '\0' )
                 {
                 std::remove(_FEDid);
                 _FEDid[0] = '\0' ;
                 }
         }
+        }
         else
             e = reponse.exception ;
     }
+
 G.Out(pdGendoc,"exit  FederationManagement::destroyFederationExecution");
 }
 
@@ -1004,4 +1009,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: FederationManagement.cc,v 3.47 2008/02/22 11:34:30 siron Exp $
+// $Id: FederationManagement.cc,v 3.48 2008/03/07 16:10:06 rousse Exp $

Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.35
retrieving revision 3.36
diff -u -b -r3.35 -r3.36
--- RTIG/RTIG.cc        27 Feb 2008 16:38:27 -0000      3.35
+++ RTIG/RTIG.cc        7 Mar 2008 16:10:06 -0000       3.36
@@ -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.35 2008/02/27 16:38:27 rousse Exp $
+// $Id: RTIG.cc,v 3.36 2008/03/07 16:10:06 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -84,7 +84,7 @@
 Socket*
 RTIG::chooseProcessingMethod(Socket *link, NetworkMessage *msg)
 {
-    G.Out(pdGendoc,"enter RTIG::chooseProcessingMethod");
+    G.Out(pdGendoc,"enter RTIG::chooseProcessingMethod type %d",msg->type);
     // This may throw a security error.
     if ( msg->type != NetworkMessage::DESTROY_FEDERATION_EXECUTION)
        socketServer.checkMessage(link->returnSocket(), msg);
@@ -987,4 +987,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG.cc,v 3.35 2008/02/27 16:38:27 rousse Exp $
+// $Id: RTIG.cc,v 3.36 2008/03/07 16:10:06 rousse Exp $