commit | 427a2147ab6ca571f5b2c10aec1153494dfbd273 | [log] [tgz] |
---|---|---|
author | Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> | Wed Dec 03 11:03:18 2014 -0800 |
committer | Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> | Wed Dec 03 11:48:56 2014 -0800 |
tree | 440b16b065fe169a9ff7ff6e72dfb380aa3aed7d | |
parent | d6755ba9d0b7d5edf64ef9439508a1454997be87 [diff] |
NPE fix for ONOS-379 Change-Id: If928809b3f29c1e7e457c84ba229279137196b35
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/HazelcastLinkResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/HazelcastLinkResourceStore.java index dc4c9d1..68c2cbb 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/HazelcastLinkResourceStore.java +++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/HazelcastLinkResourceStore.java
@@ -364,11 +364,12 @@ // concurrent allocation detected, retry transaction throw new TransactionException("Concurrent Allocation, retry"); } + } else { + List<LinkResourceAllocations> after = new ArrayList<>(before.size() + 1); + after.addAll(before); + after.add(allocations); + linkAllocs.replace(linkKey, before, after); } - List<LinkResourceAllocations> after = new ArrayList<>(before.size() + 1); - after.addAll(before); - after.add(allocations); - linkAllocs.replace(linkKey, before, after); } @Override