Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add missing null check in Container name validation
[controller.git]
/
opendaylight
/
containermanager
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
containermanager
/
ContainerConfig.java
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 01715cc1bf1e98960266f1832460aec1b74942e2..a34746949e8d9697251da00b32b442ea0c9147f4 100644
(file)
--- 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
*/
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");
}
new Status(StatusCode.SUCCESS) : new Status(StatusCode.BADREQUEST, "Invalid container name");
}