1 files changed, 7 insertions, 11 deletions
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 88b80eed068..44518a63497 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -238,19 +238,15 @@ CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind,
 CORBA_TypeCode::~CORBA_TypeCode (void)
 {
   // Delete the original, possibly nonaligned, buffer.
-  if (this->non_aligned_buffer_ != 0)
-    {
-      delete [] this->non_aligned_buffer_;
-      this->non_aligned_buffer_ = 0;
-    }
+  delete [] this->non_aligned_buffer_;
+  this->non_aligned_buffer_ = 0;
+
   this->buffer_ = 0;
 
-  // Free up our private state (if any)
-  if (this->private_state_)
-    {
-      delete this->private_state_;
-      this->private_state_ = 0;
-    }
+  // Free up our private state.
+  delete this->private_state_;
+  this->private_state_ = 0;
+
 }