Merge remote branch 'origin/topic/robin/optional-fields' into topic/logging-framework

This commit is contained in:
Seth Hall 2011-02-08 16:18:26 -05:00
commit c985aa9d82

View file

@ -407,7 +407,7 @@ int CompositeHash::SingleTypeKeySize(BroType* bt, const Val* v,
case TYPE_INTERNAL_STRING:
if ( ! v )
return 0;
return optional ? sz : 0;
// Factor in length field.
sz = SizeAlign(sz, sizeof(int));