Submit recent changes from internal branch. See CHANGES.txt for more details.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc
index 6084885b..1a6f5dfc 100644
--- a/src/google/protobuf/extension_set.cc
+++ b/src/google/protobuf/extension_set.cc
@@ -186,6 +186,18 @@ int ExtensionSet::ExtensionSize(int number) const {
   return iter->second.GetSize();
 }
 
+FieldType ExtensionSet::ExtensionType(int number) const {
+  map<int, Extension>::const_iterator iter = extensions_.find(number);
+  if (iter == extensions_.end()) {
+    GOOGLE_LOG(DFATAL) << "Don't lookup extension types if they aren't present (1). ";
+    return 0;
+  }
+  if (iter->second.is_cleared) {
+    GOOGLE_LOG(DFATAL) << "Don't lookup extension types if they aren't present (2). ";
+  }
+  return iter->second.type;
+}
+
 void ExtensionSet::ClearExtension(int number) {
   map<int, Extension>::iterator iter = extensions_.find(number);
   if (iter == extensions_.end()) return;