Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-2876: determine ModificationType while applying changes"
[yangtools.git]
/
yang
/
yang-data-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
data
/
impl
/
codec
/
xml
/
RandomPrefix.java
diff --git
a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefix.java
b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefix.java
index 518e796808d9676519e201d89db4dfabc1e90140..125ac23eb86fd057551e821e76fa757b0f2a36bf 100644
(file)
--- a/
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefix.java
+++ b/
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefix.java
@@
-15,6
+15,7
@@
import com.google.common.collect.HashBiMap;
import java.net.URI;
import java.util.Map;
import java.net.URI;
import java.util.Map;
+import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;
class RandomPrefix {
import javax.xml.namespace.NamespaceContext;
class RandomPrefix {
@@
-57,7
+58,12
@@
class RandomPrefix {
}
private boolean alreadyUsedPrefix(final String prefix) {
}
private boolean alreadyUsedPrefix(final String prefix) {
- return context != null && context.getNamespaceURI(prefix) != null;
+ if (context == null) {
+ return false;
+ }
+
+ final String str = context.getNamespaceURI(prefix);
+ return !XMLConstants.NULL_NS_URI.equals(str);
}
@VisibleForTesting
}
@VisibleForTesting