This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
The following commit(s) were added to refs/heads/master by this push:
new 88ca521 fix bad conflict
88ca521 is described below
commit 88ca5217d63f205971feb28d285589b7be57374a
Author: Antoine Toulme <[email protected]>
AuthorDate: Thu Feb 20 15:40:26 2020 -0800
fix bad conflict
---
kv/src/main/kotlin/org/apache/tuweni/kv/ProxyKeyValueStore.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kv/src/main/kotlin/org/apache/tuweni/kv/ProxyKeyValueStore.kt
b/kv/src/main/kotlin/org/apache/tuweni/kv/ProxyKeyValueStore.kt
index ca439ae..9dd8bea 100644
--- a/kv/src/main/kotlin/org/apache/tuweni/kv/ProxyKeyValueStore.kt
+++ b/kv/src/main/kotlin/org/apache/tuweni/kv/ProxyKeyValueStore.kt
@@ -66,7 +66,7 @@ class ProxyKeyValueStore<K, V, E, R>(
}
}
- override suspend fun put(key: K, value: V) = store.put(proxyKey(key),
proxyValue(value))
+ override suspend fun put(key: K, value: V) = store.put(proxyKey(key),
proxyValue(key, value))
override suspend fun keys(): Iterable<K> = store.keys().map(unproxyKey)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
