b823330a75
ENT-2036 handle ClosedChannelException during ssl handshake ( #934 )
...
* ENT-2036 handle ClosedChannelException during ssl handshake
* ENT-2036 address code review comments and revert AMQPChannelHandler as it will be fixed in OS first
2018-06-06 15:13:17 +01:00
11b78296eb
Merge pull request #936 from corda/os-merge-d620e71
...
O/S merge from d620e71
2018-06-06 13:27:03 +01:00
2aac9e8687
Merge pull request #921 from corda/ENT-1983
...
ENT-1983: throw more specific exception when starting a flow as a result
2018-06-06 12:09:10 +01:00
d675a17e17
ENT-2023 Restore rpcThreadPoolSize enterprise config setting ( #922 )
...
* Add a sampler for EmptyFlow, and also re-establish wiring to the rpcThreadPoolSize config parameter.
* Remove mutex from multi-threaded SMM startFlow
* Add EmptyFlow to nightly benchmark and also a CashIssue 200
2018-06-06 11:47:37 +01:00
f34a2bd33f
Replacing uses of assert with require
2018-06-06 09:56:04 +01:00
11fd70a1f7
Merge remote-tracking branch 'open/master' into os-merge-d620e71
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
2018-06-06 09:51:29 +01:00
d620e71bb6
Replaced all uses of assert with require ( #3309 )
...
JVM assertions have to be enabled with the -ea flag so it's possible for these checks to be ignored.
2018-06-06 00:31:41 +01:00
7e3e94cee9
OS -> ENT merge ( #928 )
...
* Revert back logging of tests (#3305 )
* ENT-2023 Minimise code diff between OS and ENT for enterprise change since code diff during merge resulted in a bad merge relating to rpcThreadPoolSize. (#3306 )
2018-06-05 19:53:07 +01:00
f4621d9a74
[CORDA-1297] Column nullability in migrations ( #916 )
...
* Migrations to proper nullability
* Removed node-core.changelog-v3-GA.xml file as indicated by PR comments, This change was already provided by nullability upgrade commits
2018-06-05 18:13:49 +01:00
e2a2c2d20d
ENT-2023 Minimise code diff between OS and ENT for enterprise change since code diff during merge resulted in a bad merge relating to rpcThreadPoolSize. ( #3306 )
2018-06-05 17:38:55 +01:00
4882e2e089
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180605
2018-06-05 13:37:35 +01:00
0812329aaf
The logic in my recent late start bridge PR was wrong. This doesn't affect embedded bridges, but for external bridges the state doesn't reset correctly on bridge restart. ( #3301 )
2018-06-05 13:30:20 +01:00
644f1c6d2f
ENT-1983: throw more specific exception when starting a flow as a result
...
of P2P messaging and SMM is stopped.
2018-06-04 19:03:36 +01:00
703f0cc86f
Liquibase script for a table name node_attchments_contracts change following fix for CORDA-1499 merged from OS.
2018-06-04 17:53:01 +01:00
f5c9a398ad
Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-04-szymon
...
# Conflicts:
# docs/source/upgrade-notes.rst
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
2018-06-04 17:35:19 +01:00
4f1a22dfac
Merge pull request #910 from corda/tudor-merge-os-01_06
...
Tudor merge os 01 06
2018-06-04 15:37:33 +01:00
3b65ca2ab6
Temporary ignore flaky Test to unblock merge
2018-06-04 14:13:59 +01:00
18a6e2fa2a
CORDA-1477 backport Ent test fixes ( #3292 )
2018-06-04 13:49:25 +01:00
29da4b02a6
Fix tests
2018-06-04 11:58:41 +01:00
63f11d0b54
Upgrade integration test for CORDA-1356 to run in database mode ( #899 )
...
Add SQL setup to run integration test in database mode, add ordering in test because original assumption that rows are returned as inserted doesn't work in Oracle db, ensure distinct names when starting nodes (they can't clash in database mode, as the schema name is taken from node name).
2018-06-04 10:31:56 +01:00
71d8586e61
ENT-1962: throw a clearer exception when starting RPC flow while SMM is stopped … ( #912 )
...
* ENT-1962: throw a clearer exception when starting RPC flow while SMM is stopped.
* ENT-1962: update exception constructor
2018-06-04 10:14:53 +01:00
7350cd9d1e
[CORDA-1408]: Fixed some Demobench bugs. ( #3288 )
2018-06-04 09:35:38 +01:00
76644e0d00
ENT-1871 Rebrand R3Corda to Corda Enterprise ( #907 )
...
* Final part of rebranding exercise.
* Fix test.
2018-06-02 10:47:31 +01:00
0ecacb894e
Fix merge
2018-06-01 17:14:27 +01:00
fc020bca4b
[CORDA-1575]: Out of process nodes started by the driver do not log to file (fix). ( #3286 )
2018-06-01 16:16:23 +01:00
57d379597b
Fix a typo in node_attchments_contracts table name. ( #3202 )
2018-06-01 16:08:19 +01:00
609c313496
CORDA-1564 Remove old sessions on flow retry from multi-threaded SMM ( #906 )
2018-06-01 15:38:09 +01:00
6dc778e404
Fix merge
2018-06-01 14:28:23 +01:00
eb801d40b8
Merge remote-tracking branch 'open/master' into tudor-merge-os-01_06
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/cordapp/Cordapp.kt
# core/src/main/kotlin/net/corda/core/internal/cordapp/CordappImpl.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
2018-06-01 13:56:43 +01:00
9efb1ecfe0
CORDA-1477 add check for code version in checkpoints ( #3256 )
...
* CORDA-1477 add check for code version in checkpoints
* CORDA-1477 Comment style
* CORDA-1477 address code review comments
* CORDA-1477 add changelog entry
* CORDA-1477 attempt to fix tests
* CORDA-1477 attempt to fix tests and address code review comments
* CORDA-1477 attempt to fix tests
2018-06-01 13:37:39 +01:00
c0ddb0b026
Merge remote-tracking branch 'remotes/open/master' into merges/may-31-19-04
...
# Conflicts:
# docs/source/network-map.rst
2018-05-31 19:06:28 +01:00
51c359c48d
CORDA-1564 Clean up old sessions when retrying flows. ( #3278 )
2018-05-31 18:43:50 +01:00
1feeda7d3b
Merge remote-tracking branch 'open/master' into os-merge-34a480d
2018-05-31 17:45:06 +01:00
34a480d7e3
Move checkPayloadIs out of the public API ( #3279 )
2018-05-31 17:40:49 +01:00
675059bfa8
System.exit node if artemis is closed ( #898 )
2018-05-31 15:08:46 +01:00
509b556807
Merge branch 'master' into kstreich-OS-ENT-merge-310518
2018-05-31 11:48:02 +01:00
27e688e2c8
Merge pull request #895 from corda/os-merge-5d1cc0b
...
O/S merge from 5d1cc0b
2018-05-31 11:14:15 +01:00
6f30225f65
Remove redundant SessionDeliverPersistenceStrategy
2018-05-31 09:59:42 +01:00
fd2f2eb14a
ENT-1871 Rebrand R3Corda to Corda Enterprise ( #838 )
...
* ENT-1871 Rebrand R3Corda to Corda Enterprise
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
2018-05-31 08:59:05 +01:00
6fef4c86d3
Update configuration files to remove references to StateMachineConfiguration
2018-05-31 08:56:37 +01:00
b43e09a939
Update configuration files to remove references to StateMachineConfiguration
2018-05-31 08:52:48 +01:00
78a5c708d2
Merge fixes
2018-05-31 00:20:32 +01:00
03fae9bd7d
Merge branch 'merge-5d1cc0b' into os-merge-5d1cc0b
...
# Conflicts:
# .idea/compiler.xml
# node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/transitions/StateMachine.kt
2018-05-30 21:47:48 +01:00
3758dbea34
CORDA-1493: add --clear-network-map-cache command line option ( #3272 )
...
CORDA-1493: add --clear-network-map-cache command
2018-05-30 18:39:27 +01:00
ef2772e328
CORDA-1540 Remove no-longer-used StateMachineConfiguration ( #3270 )
2018-05-30 17:06:36 +01:00
7b09795795
CORDA-1383: Cleaned up the JSON format of WireTransaction and SignedTransaction ( #3248 )
...
In particular correctly outputs the custom state and command objects in the txs. Also fixed up deserialisation back into the transaction objects.
2018-05-30 16:37:41 +01:00
86b4086b37
Merge pull request #892 from corda/mnesbit-merge-20180530
...
Merge from OS
2018-05-30 13:39:55 +01:00
d377f14ac3
Upgrade integration test introduced by CORDA-1465 to run in database mode ( #887 )
2018-05-30 11:31:22 +01:00
a3c6ef351d
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180530
...
# Conflicts:
# docs/source/changelog.rst
2018-05-30 11:12:25 +01:00
0a4d98161a
CORDA-1266 When a cash output is identical only the fist output is saved. ( #3244 )
2018-05-30 10:49:44 +01:00
