aboutsummaryrefslogtreecommitdiff
path: root/src/ProtocolBuffers/FieldSet.cs
diff options
context:
space:
mode:
authorcsharptest <roger@csharptest.net>2010-11-08 20:06:46 -0600
committerunknown <rknapp@.svault.int>2010-11-08 20:06:46 -0600
commit7d396f9d8a937ebfd7e27d7b253b11c47038491e (patch)
tree4484b8295f6a46506a7fe265576440fa646ddaab /src/ProtocolBuffers/FieldSet.cs
parent487da48ad2c88d7c07451c546c3541d7db7ceae6 (diff)
downloadprotobuf-7d396f9d8a937ebfd7e27d7b253b11c47038491e.tar.gz
protobuf-7d396f9d8a937ebfd7e27d7b253b11c47038491e.tar.bz2
protobuf-7d396f9d8a937ebfd7e27d7b253b11c47038491e.zip
Testing and related fixes
Diffstat (limited to 'src/ProtocolBuffers/FieldSet.cs')
-rw-r--r--src/ProtocolBuffers/FieldSet.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ProtocolBuffers/FieldSet.cs b/src/ProtocolBuffers/FieldSet.cs
index 3ac3e3d3..838d0568 100644
--- a/src/ProtocolBuffers/FieldSet.cs
+++ b/src/ProtocolBuffers/FieldSet.cs
@@ -486,7 +486,9 @@ namespace Google.ProtocolBuffers {
IMessageLite messageValue = value as IMessageLite;
isValid = messageValue != null;
#if !LITE
- isValid = isValid && ((IMessage)messageValue).DescriptorForType == ((Google.ProtocolBuffers.Descriptors.FieldDescriptor)field).MessageType;
+ if (isValid && messageValue is IMessage && field is FieldDescriptor) {
+ isValid = ((IMessage) messageValue).DescriptorForType == ((FieldDescriptor) field).MessageType;
+ }
#endif
break;
}