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 "RPC registrations should not throw"
[controller.git]
/
opendaylight
/
md-sal
/
sal-protocolbuffer-encoding
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
util
/
EncoderDecoderUtil.java
diff --git
a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java
b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java
index 41eb2e6f925551770f0278d93ab3694ab6dc5884..8e0e85cabbba31f53c43a7a6b28f6cb83e9c7501 100644
(file)
--- a/
opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java
+++ b/
opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java
@@
-31,7
+31,6
@@
import java.io.ByteArrayInputStream;
import java.io.StringWriter;
import java.util.Collections;
import java.util.List;
import java.io.StringWriter;
import java.util.Collections;
import java.util.List;
-import java.util.Set;
/*
* Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
/*
* Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
@@
-57,7
+56,7
@@
public class EncoderDecoderUtil {
factory.setIgnoringComments(true);
}
factory.setIgnoringComments(true);
}
- private static DataSchemaNode findChildNode(
Set
<DataSchemaNode> children,
+ private static DataSchemaNode findChildNode(
Iterable
<DataSchemaNode> children,
String name) {
List<DataNodeContainer> containers = Lists.newArrayList();
String name) {
List<DataNodeContainer> containers = Lists.newArrayList();