| commit | 94cc01baf8856b1193d404a9f7d896ed4193cb24 | [log] [tgz] |
|---|---|---|
| author | Ayaka Koshibe <ayaka@onlab.us> | Fri Jun 26 15:39:11 2015 -0700 |
| committer | Ayaka Koshibe <ayaka@onlab.us> | Fri Jun 26 15:40:31 2015 -0700 |
| tree | f9fa0eafa2e1fb14a2c2430318e159a3eab1456b | |
| parent | 98166f9c4b3e7e1111992963ccf0f48a2bbe9f9f [diff] |
Fix for uninitialized TransactionManager in PartitionedDatabase Reference: ONOS-2157 Change-Id: Idec1c2242dd53a31836c69339ba89988a19556bb
diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java index f13ce85..37cc540 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java +++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
@@ -232,6 +232,7 @@ Futures.getUnchecked(status); transactionManager = new TransactionManager(partitionedDatabase, consistentMapBuilder()); + partitionedDatabase.setTransactionManager(transactionManager); eventDispatcher = Executors.newSingleThreadExecutor( groupedThreads("onos/store/manager", "map-event-dispatcher"));
diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/PartitionedDatabase.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/PartitionedDatabase.java index c19bccd..bc287f0 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/PartitionedDatabase.java +++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/PartitionedDatabase.java
@@ -418,7 +418,7 @@ return subTransactions; } - protected void setTransactionManager(TransactionManager tranasactionManager) { + protected void setTransactionManager(TransactionManager transactionManager) { this.transactionManager = transactionManager; } }