X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfiguration%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfiguration%2FConfigurationObject.java;h=720dc7b2344133420a0acb8fedd0e1841c9cd07c;hp=34542de896e904db4b4422cb4be4b05a83f57d30;hb=6fd408a04fe4a3611843e2246ece6d7c34b76903;hpb=3b07ceb1141d2df0b58d5e36eac4955952f2f275 diff --git a/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationObject.java b/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationObject.java index 34542de896..720dc7b234 100644 --- a/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationObject.java +++ b/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationObject.java @@ -12,7 +12,7 @@ import java.io.Serializable; public abstract class ConfigurationObject implements Serializable { private static final long serialVersionUID = 1L; - private static final String DEFAULT_REGEX = "^[\\w-\\+\\*\\/\\.\\(\\)\\[\\]\\@]{1,256}$"; + private static final String DEFAULT_REGEX = "^[\\w-=\\+\\*\\/\\.\\(\\)\\[\\]\\@\\|\\:]{1,256}$"; private static final String REGEX_PROP_NAME = "resourceNameRegularExpression"; private static String regex; @@ -31,7 +31,7 @@ public abstract class ConfigurationObject implements Serializable { * resource name regular expression, false otherwise */ protected boolean isValidResourceName(String name) { - return (name != null) ? name.matches(regex) : false; + return name != null && name.matches(regex); } /**