commit 6b3775ada615de3e8c97980f993b13c8ea59d053
author Ray Milkey <ray@opennetworking.org> Thu Jun 28 11:18:44 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Wed Jul 11 09:35:13 2018 -0700
tree 010c868f05fed3c95784f4183f7a5b4813cb2436
parent 970b964b4187ebdc7cec09c03b93200f62229182

Bazel build of ONOS GUI package

Change-Id: Id5f9931c38f82afcdcefc49171dd79f2f5bdad14

utils/osgiwrap/src/main/java/org/onlab/osgiwrap/OSGiWrapper.java

diff --git a/utils/osgiwrap/src/main/java/org/onlab/osgiwrap/OSGiWrapper.java b/utils/osgiwrap/src/main/java/org/onlab/osgiwrap/OSGiWrapper.java
index c819ebd..b5669fe 100644
--- a/utils/osgiwrap/src/main/java/org/onlab/osgiwrap/OSGiWrapper.java
+++ b/utils/osgiwrap/src/main/java/org/onlab/osgiwrap/OSGiWrapper.java
@@ -273,8 +273,13 @@
         Jar dot = analyzer.getJar();
 
         log("wab %s", wab);
-        analyzer.setBundleClasspath("WEB-INF/classes," +
-                                    analyzer.getProperty(analyzer.BUNDLE_CLASSPATH));
+
+        String specifiedClasspath = analyzer.getProperty(analyzer.BUNDLE_CLASSPATH);
+        String bundleClasspath = "WEB-INF/classes";
+        if (specifiedClasspath != null) {
+            bundleClasspath += "," + specifiedClasspath;
+        }
+        analyzer.setBundleClasspath(bundleClasspath);
 
         Set<String> paths = new HashSet<>(dot.getResources().keySet());