summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvishal <vishal@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-02-26 02:00:58 +0000
committervishal <vishal@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-02-26 02:00:58 +0000
commitb275933e5b0edfb2fdef82f450e3896992dce785 (patch)
tree9615c5048e3c145a75397d48c49020353d6eac78
parent35b2df47ef32aedde6bb7f15683182a7d753ea84 (diff)
downloadATCD-b275933e5b0edfb2fdef82f450e3896992dce785.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a6
-rw-r--r--TAO/tao/GIOP.cpp12
2 files changed, 10 insertions, 8 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 2feb3c02d3c..80c34b27866 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Fri Feb 25 19:59:33 2000 Vishal Kachroo <vishal@cs.wustl.edu>
+
+ * tao/GIOP.cpp (process_server_request): Removed a memory leak.
+ Thanks to Klemen Zagar <klemen.zagar@ijs.si> for reporting
+ this.
+
Fri Feb 25 18:39:17 2000 Jeff Parsons <parsons@cs.wustl.edu>
* tao/Any.h:
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index 4e6598c8b1e..a9053a5b313 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -1012,28 +1012,24 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
// "Doing the Table Lookup ...\n",
// object_id.c_str ()));
- CORBA::Object_ptr object_reference =
+ CORBA::Object_var object_reference =
CORBA::Object::_nil ();
// Do the Table Lookup.
int status =
orb_core->orb ()->_tao_find_in_IOR_table (object_id,
- object_reference);
+ object_reference.out ());
// If ObjectID not in table or reference is nil raise
// OBJECT_NOT_EXIST.
- if (status == -1 || CORBA::is_nil (object_reference))
+ if (status == -1 || CORBA::is_nil (object_reference.in ()))
ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST ());
// ObjectID present in the table with an associated NON-NULL
// reference. Throw a forward request exception.
-
- CORBA::Object_ptr dup =
- CORBA::Object::_duplicate (object_reference);
-
// @@ We could simply write the response at this point...
- ACE_TRY_THROW (PortableServer::ForwardRequest (dup));
+ ACE_TRY_THROW (PortableServer::ForwardRequest (object_reference.in ()));
}
#endif /* TAO_NO_IOR_TABLE */