From 71e64f18e524d0621c7fd5832cdffafe94fdcf19 Mon Sep 17 00:00:00 2001
From: Charles Chan <rascov@gmail.com>
Date: Mon, 11 Sep 2017 15:21:57 -0700
Subject: [PATCH] Fix NoSuchElementException

Change-Id: I2c80400d10dffd7dfda777de5279135ae687af35
---
 .../onosproject/segmentrouting/DefaultRoutingHandler.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
index 0d263e7607..709d05eb06 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
@@ -244,6 +244,11 @@ public class DefaultRoutingHandler {
      */
     // XXX refactor
     protected void populateSubnet(Set<ConnectPoint> cpts, Set<IpPrefix> subnets) {
+        if (cpts == null || cpts.size() < 1 || cpts.size() > 2) {
+            log.warn("Skipping populateSubnet due to illegal size of connect points. {}", cpts);
+            return;
+        }
+
         lastRoutingChange = DateTime.now();
         statusLock.lock();
         try {