Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Increase timeout for waiting for broker service in sal-binding-it."
[controller.git]
/
opendaylight
/
configuration
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
configuration
/
ConfigurationObject.java
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 34542de896e904db4b4422cb4be4b05a83f57d30..720dc7b2344133420a0acb8fedd0e1841c9cd07c 100644
(file)
--- 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;
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;
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) {
* resource name regular expression, false otherwise
*/
protected boolean isValidResourceName(String name) {
- return
(name != null) ? name.matches(regex) : false
;
+ return
name != null && name.matches(regex)
;
}
/**
}
/**