Merge remote-tracking branch 'origin/master'

This commit is contained in:
danielshaya
2014-11-13 11:39:22 +00:00
8 changed files with 17 additions and 23 deletions
@@ -136,7 +136,7 @@ public abstract class AbstractChronicleMapBuilder<K, V,
private MapEventListener<K, V, ChronicleMap<K, V>> eventListener =
MapEventListeners.nop();
private V defaultValue = null;
private DefaultValueProvider<K, V> defaultValueProvider = NullValueProvider.INSTANCE;
private DefaultValueProvider<K, V> defaultValueProvider = null;
private PrepareValueBytes<K, V> prepareValueBytes = null;
private SingleChronicleHashReplication singleHashReplication = null;
@@ -237,12 +237,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
if (closeables != null)
closeables.closeQuietly();
closeables = null;
try {
// give time to close
Thread.sleep(100);
} catch (InterruptedException e) {
//
}
}
/**
@@ -399,7 +394,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
}
public synchronized V acquireUsing(@NotNull K key, V usingValue) {
public synchronized V acquireUsing(@NotNull K key, V usingValue) {
throw new UnsupportedOperationException("acquireUsing() is not supported for stateless " +
"clients");
}