From: Jan Srnicek Date: Wed, 18 Jan 2017 09:36:05 +0000 (+0100) Subject: HONEYCOMB-337 - Fixed ordering for PitrCfg writers X-Git-Tag: 1.17.01-RC2~4 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=97a60a88c50402e4a3af0c1138f2c04e4488aaa1;p=hc2vpp.git HONEYCOMB-337 - Fixed ordering for PitrCfg writers PitrCfg holds reference to locator set, therefore must be deleted before Change-Id: Ic4d2d7e26126991a4426310e4e4a5f0516969fc9 Signed-off-by: Jan Srnicek --- diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java index d5eef4868..fd5443bb9 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java @@ -17,6 +17,8 @@ package io.fd.hc2vpp.lisp.translate.write.factory; +import static io.fd.hc2vpp.lisp.translate.write.factory.LocatorSetWriterFactory.LOCATOR_SET_ID; + import io.fd.hc2vpp.lisp.translate.AbstractLispInfraFactoryBase; import io.fd.hc2vpp.lisp.translate.write.LispCustomizer; import io.fd.hc2vpp.lisp.translate.write.PitrCfgCustomizer; @@ -40,7 +42,7 @@ public final class LispWriterFactory extends AbstractLispInfraFactoryBase implem public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) { registry.add(new GenericWriter<>(lispInstanceIdentifier, new LispCustomizer(vppApi))); - registry.add(new GenericWriter<>(lispInstanceIdentifier.child(LispFeatureData.class).child(PitrCfg.class), - new PitrCfgCustomizer(vppApi))); + registry.addAfter(new GenericWriter<>(lispInstanceIdentifier.child(LispFeatureData.class).child(PitrCfg.class), + new PitrCfgCustomizer(vppApi)),LOCATOR_SET_ID); } }