[ORBit2] Fix FMR in forwarding code. Patch from Thoralf Lund. Also noted by Jules Colding on the mailing list



commit b359a63483861ab4a18af144d15e16b8f168823f
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Wed Oct 28 10:33:09 2009 +0100

    Fix FMR in forwarding code. Patch from Thoralf Lund. Also noted by Jules Colding on the mailing list earlier. Closes bug #582158.

 src/orb/orb-core/corba-object.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/src/orb/orb-core/corba-object.c b/src/orb/orb-core/corba-object.c
index f1e04b7..28900e1 100644
--- a/src/orb/orb-core/corba-object.c
+++ b/src/orb/orb-core/corba-object.c
@@ -396,12 +396,11 @@ GIOPConnection *
 ORBit_handle_location_forward (GIOPRecvBuffer *buf,
 			       CORBA_Object    obj)
 {
-	GIOPConnection *retval = NULL;
 	GSList         *profiles = NULL;
 	GIOPConnection *old_connection;
 
 	if (ORBit_demarshal_IOR (obj->orb, buf, NULL, &profiles))
-		goto out;
+	  return NULL;
 
 	OBJECT_LOCK (obj);
 	IOP_delete_profiles (obj->orb, &obj->forward_locations);
@@ -415,12 +414,7 @@ ORBit_handle_location_forward (GIOPRecvBuffer *buf,
 
 	giop_connection_unref (old_connection);
 
-	retval = ORBit_object_get_connection (obj);
-
- out:
-	giop_recv_buffer_unuse (buf);
-
-	return retval;
+	return ORBit_object_get_connection (obj);
 }
 
 CORBA_InterfaceDef



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]