ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-02 16:53:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Minor: a serialisation related fix and an additional explainer comment in SerializedBytes

Browse Source
This commit is contained in:
Mike Hearn 2016-03-01 15:23:47 +01:00
parent 42cd9a14cb
commit c52f1e096f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/kotlin/core/serialization/Kryo.kt
View File

@ -68,6 +68,7 @@ val THREAD_LOCAL_KRYO = ThreadLocal.withInitial { createKryo() }
* to get the original object back. * to get the original object back.
*/ */
class SerializedBytes<T : Any>(bits: ByteArray) : OpaqueBytes(bits) { class SerializedBytes<T : Any>(bits: ByteArray) : OpaqueBytes(bits) {
// It's OK to use lazy here because SerializedBytes is configured to use the ImmutableClassSerializer.
val hash: SecureHash by lazy { bits.sha256() } val hash: SecureHash by lazy { bits.sha256() }
fun writeToFile(path: Path) = Files.write(path, bits) fun writeToFile(path: Path) = Files.write(path, bits)

9
core/src/main/kotlin/core/utilities/ProgressTracker.kt
View File

@ -65,8 +65,13 @@ class ProgressTracker(vararg steps: Step) {
override val label: String get() = currentLabel override val label: String get() = currentLabel
} }
object UNSTARTED : Step("Unstarted") // Sentinel objects. Overrides equals() to survive process restarts and serialization.
object DONE : Step("Done") object UNSTARTED : Step("Unstarted") {
override fun equals(other: Any?) = other is UNSTARTED
}
object DONE : Step("Done") {
override fun equals(other: Any?) = other is DONE
}
/** The steps in this tracker, same as the steps passed to the constructor but with UNSTARTED and DONE inserted. */ /** The steps in this tracker, same as the steps passed to the constructor but with UNSTARTED and DONE inserted. */
val steps = arrayOf(UNSTARTED, *steps, DONE) val steps = arrayOf(UNSTARTED, *steps, DONE)