Merge branch 'sync-stage' of https://github.com/esorot/protobuf into sync-stage

2 years ago · 53ff307d61
parent 270111c472 24106fbe3a
commit 53ff307d61
1 changed files with 3 additions and 1 deletions
--- a/src/google/protobuf/compiler/java/doc_comment.cc
+++ b/src/google/protobuf/compiler/java/doc_comment.cc
@ -147,7 +147,9 @@ static void WriteDocCommentBodyForLocation(io::Printer* printer,
                             ? location.trailing_comments
                             : location.leading_comments;
  if (!comments.empty()) {
-    if (!kdoc) {
+    if (kdoc) {
+      comments = EscapeKdoc(comments);
+    } else {
      comments = EscapeJavadoc(comments);
    }