| commit | a672f4421761f27b8b9f3974855c40bc70e76a52 | [log] [tgz] |
|---|---|---|
| author | Michael Blow <michael.blow@couchbase.com> | Mon Feb 29 14:58:29 2016 -0500 |
| committer | Till Westmann <tillw@apache.org> | Mon Feb 29 12:30:07 2016 -0800 |
| tree | 536673dd8dcd704ea54325bdaa56d6225e7726b6 | |
| parent | 756ba73d1d977f3cba0e86e7c96efdb2ae88deca [diff] |
Fix Double-Checked Locking (Coverity) Fix CIDs 68208,68209,68210 - eliminate problematic double-checked locking Change-Id: I3383035b5e8e0aa3cfd54f803f12d56090f006cf Reviewed-on: https://asterix-gerrit.ics.uci.edu/667 Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Reviewed-by: Ian Maxon <imaxon@apache.org>
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java index c82bf28..ab5be15 100644 --- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java +++ b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeDataflowHelper.java
@@ -56,9 +56,6 @@ @Override public IIndex getIndexInstance() { - if (index != null) { - return index; - } synchronized (lcManager) { if (index == null) { try {
diff --git a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java index 56e9014..6e0beb3 100644 --- a/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java +++ b/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyDataflowHelper.java
@@ -57,9 +57,6 @@ @Override public IIndex getIndexInstance() { - if (index != null) { - return index; - } synchronized (lcManager) { if (index == null) { try {
diff --git a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeDataflowHelper.java b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeDataflowHelper.java index 48cc476..79e082c 100644 --- a/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeDataflowHelper.java +++ b/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeDataflowHelper.java
@@ -72,9 +72,6 @@ @Override public IIndex getIndexInstance() { - if (index != null) { - return index; - } synchronized (lcManager) { if (index == null) { try {