down integrate to svn

1 files changed, 5 insertions, 8 deletions

diff --git a/src/google/protobuf/compiler/java/java_doc_comment.cc b/src/google/protobuf/compiler/java/java_doc_comment.cc
index 60b4f2ac..23127b7f 100644
--- a/src/google/protobuf/compiler/java/java_doc_comment.cc
+++ b/src/google/protobuf/compiler/java/java_doc_comment.cc
@@ -70,12 +70,10 @@ string EscapeJavadoc(const string& input) {
         }
         break;
       case '@':
-        // "{@" starts Javadoc markup.
-        if (prev == '{') {
-          result.append("@");
-        } else {
-          result.push_back(c);
-        }
+        // '@' starts javadoc tags including the @deprecated tag, which will
+        // cause a compile-time error if inserted before a declaration that
+        // does not have a corresponding @Deprecated annotation.
+        result.append("@");
         break;
       case '<':
         // Avoid interpretation as HTML.
@@ -117,8 +115,7 @@ static void WriteDocCommentBodyForLocation(
     // HTML-escape them so that they don't accidentally close the doc comment.
     comments = EscapeJavadoc(comments);
 
-    vector<string> lines;
-    SplitStringAllowEmpty(comments, "\n", &lines);
+    vector<string> lines = Split(comments, "\n");
     while (!lines.empty() && lines.back().empty()) {
       lines.pop_back();
     }