Revert "HONEYCOMB-315 - Quickfix to prevent JNI crash in routing"

This reverts commit 618d9fb357be27b06d27608fa1fc4aecb557c548.
Depends on https://gerrit.fd.io/r/#/c/4325/

Change-Id: I0bc78e5510082fbfbaf99967f6fe3a9516dc7a4e
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java
index 5bf87f7..63ee5a1 100644 (file)
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/trait/RouteRequestProducer.java
@@ -133,11 +133,6 @@ public interface RouteRequestProducer extends ByteDataTranslator, AddressTransla
         request.classifyTableIndex = classifyTableIndex;
         request.isClassify = classifyTableSet;
 
-        // not used, prevents crash
-        // TODO - remove after VPP-559
-        request.nextHopOutLabelStack = new int[0];
-
-
         return request;
     }
 }

diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java
index 9764812..a13364d 100644 (file)
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java
@@ -113,7 +113,6 @@ public interface RoutingRequestTestHelper extends ByteDataTranslator, FutureProd
         request.isLocal = toByte(isLocal);
         request.isUnreach = toByte(isUnreach);
         request.isProhibit = toByte(isProhibit);
-        request.nextHopOutLabelStack = new int[0];
         return request;
     }