commit 36cbc71fa089aab6c72b63be4ddafe8543c5a9a3
author Ray Milkey <ray@onlab.us> Fri Apr 07 13:33:59 2017 -0700
committer Ray Milkey <ray@onlab.us> Fri Apr 07 13:33:59 2017 -0700
tree f12063713c2166da065609e9f3932ff87ff50b79
parent cb42c3121996e7d404f0c2365d9c6227ab590244

Fix problem with cluter not forming

Change-Id: Iea3ad0b5dd3367ed88663cf5ade3f81aacc2bfce

core/net/src/main/java/org/onosproject/cluster/impl/ClusterMetadataManager.java

diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/ClusterMetadataManager.java b/core/net/src/main/java/org/onosproject/cluster/impl/ClusterMetadataManager.java
index 416bbf14..ec64d3e 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/ClusterMetadataManager.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/ClusterMetadataManager.java
@@ -131,7 +131,7 @@
         String metadataUri = System.getProperty("onos.cluster.metadata.uri");
         try {
             String protocol = metadataUri == null ? null : new URL(metadataUri).getProtocol();
-            if (!"file".equals(protocol) && !"http".equals(protocol)) {
+            if (protocol != null && (!"file".equals(protocol) && !"http".equals(protocol))) {
                 return getProvider(protocol);
             }
             // file provider supports both "file" and "http" uris