summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-12 01:41:54 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-12 01:41:54 +0000
commit3c07c4cd5134af4af3ab30493fdfc90617bdff4d (patch)
tree27b5ea7d0e10e17e96e89de91039ebeaeeba5575
parentab025870cf621cf6d5df6f64abb23201baff257a (diff)
downloadATCD-3c07c4cd5134af4af3ab30493fdfc90617bdff4d.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog-99c8
-rw-r--r--TAO/tao/Environment.cpp3
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 7c6024fa88e..8d3c7cfbf0c 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,11 @@
+Tue May 11 20:40:52 1999 Jeff Parsons <parsons@cs.wustl.edu>
+
+ * tao/Environment.cpp:
+ Added a check for NULL pointer before dereferencing the
+ exception (to increment the refcount) in the copy
+ constructor. This was causing all the DII param_tests to
+ fail.
+
Tue May 11 18:06:40 1999 Balachandran Natarajan <bala@cs.wustl.edu>
* tao/Makefile:
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index ab4d7956c86..5337ff8c813 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -47,7 +47,8 @@ CORBA_Environment::CORBA_Environment (const CORBA_Environment& rhs)
previous_ (0)
{
// TAO_ORB_Core_instance ()->default_environment (this);
- exception_->_incr_refcnt ();
+ if (this->exception_)
+ this->exception_->_incr_refcnt ();
}
CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core)