Merge pull request #4135 from mitza-oci/typesupport-data-conversions

Fixed warnings in FooTypeSupportImpl::encode_to_bytes

Author: jrw972

dds/idl/ts_generator.cpp

@@ -413,11 +413,16 @@ bool ts_generator::generate_ts(AST_Decl* node, UTL_ScopedName* name)
       "  if (jrf) {\n"
       "    CORBA::String_var buffer;\n"
       "    const ::DDS::ReturnCode_t ret = encode_to_string(in, buffer, format);\n"
-      "    const ::DDS::UInt32 len = static_cast< ::DDS::UInt32>(std::strlen(buffer));\n"
-      "    out = new ::DDS::OctetSeq(len);\n"
-      "    out->length(len);\n"
-      "    std::memcpy(out->get_buffer(), buffer, len);\n"
-      "    return ::DDS::RETCODE_OK;\n"
+      "    if (ret == ::DDS::RETCODE_OK) {\n"
+      "      const ::DDS::UInt32 len = static_cast< ::DDS::UInt32>(std::strlen(buffer));\n"
+      "      out = new ::DDS::OctetSeq(len);\n"
+      "      out->length(len);\n"
+      "      std::memcpy(out->get_buffer(), buffer, len);\n"
+      "      return ::DDS::RETCODE_OK;\n"
+      "    } else {\n"
+      "      out = new ::DDS::OctetSeq();\n"
+      "      return ret;\n"
+      "    }\n"
       "  }\n"
       "#else\n"
       "  ACE_UNUSED_ARG(in);\n"