Add java options to plugin proto and rollback the r450

protocolbuffers · Dec 5, 2012 · 2273ee4 · 2273ee4
1 parent 0c995c9
commit 2273ee4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 53 deletions.
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc
@@ -857,14 +857,12 @@ GenerateDefaultInstanceInitializer(io::Printer* printer) {
 void MessageGenerator::
 GenerateShutdownCode(io::Printer* printer) {
   printer->Print(
-    "delete $classname$::default_instance_;\n"
-    "$classname$::default_instance_ = NULL;\n",
+    "delete $classname$::default_instance_;\n",
     "classname", classname_);
 
   if (HasDescriptorMethods(descriptor_->file())) {
     printer->Print(
-      "delete $classname$_reflection_;\n"
-      "$classname$_reflection_ = NULL;\n",
+      "delete $classname$_reflection_;\n",
       "classname", classname_);
   }
 

diff --git a/src/google/protobuf/compiler/cpp/cpp_string_field.cc b/src/google/protobuf/compiler/cpp/cpp_string_field.cc
@@ -251,8 +251,7 @@ void StringFieldGenerator::
 GenerateShutdownCode(io::Printer* printer) const {
   if (!descriptor_->default_value_string().empty()) {
     printer->Print(variables_,
-      "delete $classname$::$default_variable$;\n"
-      "$classname$::$default_variable$ = NULL;\n");
+      "delete $classname$::$default_variable$;\n");
   }
 }
 

diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc
diff --git a/src/google/protobuf/compiler/plugin.proto b/src/google/protobuf/compiler/plugin.proto
@@ -45,6 +45,8 @@
 // flag "--${NAME}_out" is passed to protoc.
 
 package google.protobuf.compiler;
+option java_package = "com.google.protobuf.compiler";
+option java_outer_classname = "PluginProtos";
 
 import "google/protobuf/descriptor.proto";
 

diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc