Merge branch 'master' into log-strategy-lock

DOCGroup · Feb 3, 2025 · cbd72dc · cbd72dc
2 parents b1b830c + 5f11974
commit cbd72dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp
@@ -778,7 +778,7 @@ ACE_Configuration_Win32Registry::get_string_value (const ACE_Configuration_Secti
       return -1;
     }
 
-  value = buffer.get ();
+  value.set (buffer.get (), buffer_length, true);
   return 0;
 }
 

diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
@@ -621,7 +621,7 @@ ACE_Log_Msg::ACE_Log_Msg ()
     linenum_ (0),
     msg_ (0),
     restart_ (1),  // Restart by default...
-    ostream_ (0),
+    ostream_ (nullptr),
     ostream_refcount_ (0),
     msg_callback_ (0),
     trace_depth_ (0),
@@ -753,8 +753,8 @@ ACE_Log_Msg::cleanup_ostream ()
           ACE_OS::fclose (this->ostream_);
 #else
           delete this->ostream_;
-          this->ostream_ = 0;
 #endif
+          this->ostream_ = nullptr;
         }
       this->ostream_refcount_ = 0;
     }