commit cf3284174edba18f921995fe01fb0e5f802caf7e
author Andrea Campanella <andrea@opennetworking.org> Wed Oct 07 16:44:21 2020 +0200
committer Andrea Campanella <andrea@opennetworking.org> Fri Oct 09 07:35:10 2020 +0000
tree 7e7419e0ecea99485f91bb13b8b6bb0a40ce2061
parent c9d0d7088439fedac8c255172a321f323433bcfc

[ONOS-8121][VOL-3259] Fixing null filter for felix fileinstall

Change-Id: Ib5ef99002ad1d0a40e767528223e324326f2c022

tools/package/onos-prep-karaf

diff --git a/tools/package/onos-prep-karaf b/tools/package/onos-prep-karaf
index 50516c1..cd906dc 100755
--- a/tools/package/onos-prep-karaf
+++ b/tools/package/onos-prep-karaf
@@ -34,6 +34,10 @@
 perl -pi.old -e "s/maxFileSize=1MB/maxFileSize=10MB/g" \
     $KARAF_DIR/etc/org.ops4j.pax.logging.cfg
 
+# Patch the fileinstall to avoid NPE when filter is null
+echo "felix.fileinstall.filter=*.jar" >> \
+    $KARAF_DIR/etc/org.apache.felix.fileinstall-deploy.cfg
+
 # Patch-in proper Karaf version into the startup script
 perl -pi.bk -e 's/apache-karaf-\$KARAF_VERSION/$ENV{KARAF_DIR}/g' $SANDBOX/bin/onos-service