Sat Dec 6 20:18:38 UTC 2008 James H. Hill <hillj@isis.vanderbilt.edu>

1 files changed, 11 insertions, 9 deletions

diff --git a/ACE/ace/UUID.inl b/ACE/ace/UUID.inl
index 89526473b0a..bbc494197bd 100644
--- a/ACE/ace/UUID.inl
+++ b/ACE/ace/UUID.inl
@@ -68,20 +68,22 @@ namespace ACE_Utils
     this->clock_seq_low_ = clock_seq_low;
   }
 
-  ACE_INLINE UUID_Node*
+  ACE_INLINE const UUID_Node*
   UUID::node (void) const
   {
-    return this->node_;
+    return &this->node_;
   }
 
-  ACE_INLINE void
-  UUID::node (UUID_Node* node)
+  ACE_INLINE UUID_Node*
+  UUID::node (void)
   {
-    if (node_release_)
-      delete node_;
+    return &this->node_;
+  }
 
-    this->node_ = node;
-    node_release_ = false;
+  ACE_INLINE void
+  UUID::node (const UUID_Node* node)
+  {
+    this->node_ = *node;
   }
 
   ACE_INLINE ACE_CString*
@@ -122,7 +124,7 @@ namespace ACE_Utils
         (this->time_hi_and_version_ != right.time_hi_and_version ()) ||
         (this->clock_seq_hi_and_reserved_ != right.clock_seq_hi_and_reserved ()) ||
         (this->clock_seq_low_ != right.clock_seq_low ()) ||
-        (*this->node_ != *right.node ()))
+        (this->node_ != *right.node ()))
       return false;
 
       return true;