diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-11-28 14:17:57 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-11-28 14:17:57 +0000 |
| commit | 6467ac846a14508ba5d3224dd9db29362ce86b94 (patch) | |
| tree | 186537de2220ebd645da8a8b400f88993899872c | |
| parent | c17f36b549b164e5af4ead3a273e2d7a742d2207 (diff) | |
| download | ATCD-6467ac846a14508ba5d3224dd9db29362ce86b94.tar.gz | |
ChangeLog Tag: Wed Nov 28 14:14:51 UTC 2012 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_global.cpp | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 78c8051e7ad..c0d8d548126 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Wed Nov 28 14:14:51 UTC 2012 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/util/utl_global.cpp (destroy): + + Added check for null before calling + reset_last_in_same_parent_scope() on the internal CORBA + module AST node. Thanks to Simon Massey + <simon dot massey at primstech dot com> for pointing + out this problem. + Wed Nov 28 07:33:16 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * tao/AnyTypeCode/Any.cpp: diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index 71a0527a3da..a43f55a6496 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -931,7 +931,10 @@ IDL_GlobalData::destroy (void) // Reset the member of the CORBA module containing the basic types // to point to itself, since all the other CORBA modules (if any) // will be destroyed. - this->corba_module_->reset_last_in_same_parent_scope (); + if (this->corba_module_ != 0) + { + this->corba_module_->reset_last_in_same_parent_scope (); + } if (0 != this->pd_root) { |