mirror of
https://github.com/corda/corda.git
synced 2025-05-21 01:37:41 +00:00
Merge pull request #7858 from corda/merge-release/os/4.9-release/os/4.10-2024-10-28-389
ENT-12152: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-28
This commit is contained in:
commit
a905c5b245
@ -86,6 +86,7 @@ import java.time.Clock
|
|||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
import java.util.concurrent.atomic.AtomicInteger
|
import java.util.concurrent.atomic.AtomicInteger
|
||||||
import java.util.concurrent.atomic.AtomicReference
|
import java.util.concurrent.atomic.AtomicReference
|
||||||
|
import org.hibernate.internal.SessionFactoryRegistry
|
||||||
|
|
||||||
val MOCK_VERSION_INFO = VersionInfo(PLATFORM_VERSION, "Mock release", "Mock revision", "Mock Vendor")
|
val MOCK_VERSION_INFO = VersionInfo(PLATFORM_VERSION, "Mock release", "Mock revision", "Mock Vendor")
|
||||||
|
|
||||||
@ -624,6 +625,7 @@ open class InternalMockNetwork(cordappPackages: List<String> = emptyList(),
|
|||||||
}
|
}
|
||||||
messagingNetwork.stop()
|
messagingNetwork.stop()
|
||||||
}
|
}
|
||||||
|
SessionFactoryRegistry.INSTANCE.clearRegistrations()
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Block until all scheduled activity, active flows and network activity has ceased. */
|
/** Block until all scheduled activity, active flows and network activity has ceased. */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user