2 files changed, 5 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/java/java_extension.h b/src/google/protobuf/compiler/java/java_extension.h
index fac5ba00..bdd42263 100644
--- a/src/google/protobuf/compiler/java/java_extension.h
+++ b/src/google/protobuf/compiler/java/java_extension.h
@@ -67,7 +67,11 @@ class ExtensionGenerator {
   virtual ~ExtensionGenerator() {}
 
   virtual void Generate(io::Printer* printer) = 0;
+
+  // Returns an estimate of the number of bytes the printed code will compile to
   virtual int GenerateNonNestedInitializationCode(io::Printer* printer) = 0;
+
+  // Returns an estimate of the number of bytes the printed code will compile to
   virtual int GenerateRegistrationCode(io::Printer* printer) = 0;
 
  protected:
diff --git a/src/google/protobuf/compiler/java/java_file.cc b/src/google/protobuf/compiler/java/java_file.cc
index 9f285774..4a1f4529 100644
--- a/src/google/protobuf/compiler/java/java_file.cc
+++ b/src/google/protobuf/compiler/java/java_file.cc
@@ -65,7 +65,7 @@ namespace {
 
 struct FieldDescriptorCompare {
   bool operator ()(const FieldDescriptor* f1, const FieldDescriptor* f2) {
-    if(f1== NULL) {
+    if(f1 == NULL) {
       return false;
     }
     if(f2 == NULL) {