- HeaderSerializer<MatchEntries> entrySerializer = registry.getSerializer(
- new EnhancedMessageTypeKey<>(EncodeConstants.OF13_VERSION_ID,
- entry.getOxmClass(), entry.getOxmMatchField()));
+ MatchEntrySerializerKey<?, ?> key = new MatchEntrySerializerKey<>(
+ EncodeConstants.OF13_VERSION_ID, entry.getOxmClass(), entry.getOxmMatchField());
+ if (entry.getOxmClass().equals(ExperimenterClass.class)) {
+ key.setExperimenterId(entry.getAugmentation(ExperimenterMatchEntry.class).getExperimenter());
+ } else {
+ key.setExperimenterId(null);
+ }
+ HeaderSerializer<MatchEntries> entrySerializer = registry.getSerializer(key);