Integrated internal changes from Google

This includes all internal changes from around May 20 to now.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/google/protobuf/compiler/java/java_context.cc b/src/google/protobuf/compiler/java/java_context.cc
index 0a112888..6cfa14a0 100644
--- a/src/google/protobuf/compiler/java/java_context.cc
+++ b/src/google/protobuf/compiler/java/java_context.cc
@@ -42,8 +42,8 @@ namespace protobuf {
 namespace compiler {
 namespace java {
 
-Context::Context(const FileDescriptor* file)
-    : name_resolver_(new ClassNameResolver), enforce_lite_(false) {
+Context::Context(const FileDescriptor* file, const Options& options)
+    : name_resolver_(new ClassNameResolver), options_(options) {
   InitializeFieldGeneratorInfo(file);
 }
 
@@ -192,8 +192,8 @@ const OneofGeneratorInfo* Context::GetOneofGeneratorInfo(
 // Does this message class have generated parsing, serialization, and other
 // standard methods for which reflection-based fallback implementations exist?
 bool Context::HasGeneratedMethods(const Descriptor* descriptor) const {
-  return enforce_lite_ || descriptor->file()->options().optimize_for() !=
-           FileOptions::CODE_SIZE;
+  return options_.enforce_lite ||
+         descriptor->file()->options().optimize_for() != FileOptions::CODE_SIZE;
 }
 
 }  // namespace java