NPE during acquiring of component lock was fixed.
@@ -102,11 +102,11 @@ public final class OCellBTreeMultiValueIndexEngine
@Override
public void create(
OAtomicOperation atomicOperation,
- OBinarySerializer valueSerializer,
+ @SuppressWarnings("rawtypes") OBinarySerializer valueSerializer,
boolean isAutomatic,
OType[] keyTypes,
boolean nullPointerSupport,
- OBinarySerializer keySerializer,
+ @SuppressWarnings("rawtypes") OBinarySerializer keySerializer,
int keySize,
Map<String, String> engineProperties,
OEncryption encryption) {
@@ -230,7 +230,7 @@ public final class OCellBTreeMultiValueIndexEngine
final String name,
final int keySize,
final OType[] keyTypes,
- final OBinarySerializer keySerializer,
+ @SuppressWarnings("rawtypes") final OBinarySerializer keySerializer,
final OEncryption encryption) {
if (mvTree != null) {
//noinspection unchecked
@@ -566,12 +566,14 @@ public final class OCellBTreeMultiValueIndexEngine
public boolean acquireAtomicExclusiveLock(Object key) {
if (mvTree != null) {
mvTree.acquireAtomicExclusiveLock();
- }
+ } else {
assert svTree != null;
assert nullTree != null;
svTree.acquireAtomicExclusiveLock();
nullTree.acquireAtomicExclusiveLock();
+ }
+
return true;
}
