From: Alessandro Boch <aboch@cisco.com>
Date: Tue, 17 Sep 2013 00:59:38 +0000 (-0700)
Subject: Add missing null check in Container name validation
X-Git-Tag: releasepom-0.1.0~82^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=d4b379c1422568e03de847c9ce2de93b6bc26abc

Add missing null check in Container name validation

Change-Id: Ie13d7a3a5d1068064e1c8d72ec9a8b6b343077c6
Signed-off-by: Alessandro Boch <aboch@cisco.com>
---

diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java b/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java
index 01715cc1bf..a34746949e 100644
--- a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java
+++ b/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java
@@ -223,7 +223,7 @@ public class ContainerConfig implements Serializable {
      */
     private Status validateName() {
         // No Container configuration allowed to container default
-        return (container.matches(regexName) && !container.equalsIgnoreCase(GlobalConstants.DEFAULT.toString())) ?
+        return ((container != null) && container.matches(regexName) && !container.equalsIgnoreCase(GlobalConstants.DEFAULT.toString())) ?
                 new Status(StatusCode.SUCCESS) : new Status(StatusCode.BADREQUEST, "Invalid container name");
     }