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 "Fix for possible NPE if Bundle is stopped."
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DistributedDataStoreIntegrationTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java
index fc527b6bffe13726d89d5923cee71a6c471af055..49408b741019c98debbe70b37857d871d0f80b8b 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java
@@
-72,7
+72,7
@@
public class DistributedDataStoreIntegrationTest {
protected void run() {
try {
final DistributedDataStore distributedDataStore =
protected void run() {
try {
final DistributedDataStore distributedDataStore =
- new DistributedDataStore(getSystem(), "config", new MockClusterWrapper(), configuration);
+ new DistributedDataStore(getSystem(), "config", new MockClusterWrapper(), configuration
, null
);
distributedDataStore.onGlobalContextUpdated(TestModel.createTestContext());
distributedDataStore.onGlobalContextUpdated(TestModel.createTestContext());
@@
-154,7
+154,7
@@
public class DistributedDataStoreIntegrationTest {
try {
final DistributedDataStore distributedDataStore =
new DistributedDataStore(getSystem(), "config",
try {
final DistributedDataStore distributedDataStore =
new DistributedDataStore(getSystem(), "config",
- new MockClusterWrapper(), configuration);
+ new MockClusterWrapper(), configuration
, null
);
distributedDataStore.onGlobalContextUpdated(
SchemaContextHelper.full());
distributedDataStore.onGlobalContextUpdated(
SchemaContextHelper.full());