Merge branch 'master' into dev-karaf-4.2.1

Change-Id: Iec1b8947c898b0bf10db8caece0c3a064d1c63ae
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java b/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java
index fe65e6e..99ff091 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java
@@ -495,7 +495,7 @@
             // get path here, need to use the same for fwd and rev direction
             List<Link> path = getPath(pw.l2TunnelPolicy().cP1(),
                                       pw.l2TunnelPolicy().cP2());
-            if (path == null) {
+            if (path == null || path.isEmpty()) {
                 log.error("Deploying process : No path between the connection points for pseudowire {}", l2TunnelId);
                 return PATH_NOT_FOUND.appendError("No path between the connection points for pseudowire!");
             }