12550 Commits

Author SHA1 Message Date
gaugfather
2f34b16b07 Fix to allow equality of hostname (#3381)
* Fix to allow equality of hostname

* Remove unreliable require test per pull 3381

* Remove unreliable require test per pull 3381
2018-06-21 09:03:32 +01:00
Rick Parker
5685b9f2db
ENT-2106 Change RPC connection pooling in JMeter samplers to avoid running out of file descriptors (#1033) 2018-06-20 18:32:37 +01:00
Thomas Schroeter
ed3944c546
Create Artemis p2p.inbound addresses before starting the broker (#3407) 2018-06-20 16:24:30 +01:00
Chris Rankin
9b5a099302
ENT-2105: Remove unnecessary sourceSets from integration tests. (#1029)
The database scripts are already available from the test-utils JAR via the classpath and so don't need
to be included as additional source sets.
2018-06-20 15:38:48 +01:00
Thomas Schroeter
0a1f49fbaf
Perftestcordapp result contains immutable list (#1027) 2018-06-20 15:24:51 +01:00
szymonsztuka
867e8a85af ENT-2035 Use ./drives folder for JDBC jars instead of one specified by jarDirs configuration option (#1023) 2018-06-20 13:45:20 +01:00
bpaunescu
ddcdb370b3
ENT-2053 Artemis cleanup fix (#987)
* Bridge kill test

Fix Artemis settings

ENT-2053: add quasar for gradle file

Add several flow + bridge kill test

Debugging

Potential fix

* ENT-2053: create p2p queues in exclusive mode to avoid reordering when bridge is killed

* ENT-2053: add exclusive flag to rest of p2p queues

* ENT-2053: check addresses' types when creating queues for exclusive mode

* Revert "Debugging"

This reverts commit d48a49c91f3fba0609b9b744c78fc671f4a92076.

* ENT-2053:address PR comments
2018-06-20 13:06:24 +01:00
Matthew Nesbit
4ff5aa34b6 Change to use MDC logic in bridge/AMQP protocol logging (#3398) 2018-06-20 11:55:59 +01:00
Michele Sollecito
80d7c28606
Merge pull request #1025 from corda/merges/june-19-17-37 2018-06-19 17:41:55 +01:00
sollecitom
da22fa4db4 Merged open master 2018-06-19 17:39:33 +01:00
Michele Sollecito
0bd09ff8a3
Updated version of gradle plugins. (#3405) 2018-06-19 17:37:44 +01:00
Andrius Dagys
abfdfc1a66 CORDA-1645: Fix compilation issue (#3404) 2018-06-19 17:10:16 +01:00
Michele Sollecito
e46395d7d8
Merge pull request #1021 from corda/merges/june-19-16-47 2018-06-19 16:55:43 +01:00
sollecitom
bf1b3a37ce Merge remote-tracking branch 'remotes/open/master' into merges/june-19-16-47 2018-06-19 16:48:12 +01:00
Michele Sollecito
af93ff8d1c
[CORDA-1638]: Node crashes in --initial-registration polling mode if doorman returns a transient HTTP error (fix). (#3403) 2018-06-19 16:43:46 +01:00
Andrius Dagys
41648d5a15
CORDA-1645: Checkpoint before calling an idempotent sub-flow. (#3399)
* CORDA-1645: Checkpoint before calling an idempotent sub-flow.

When an idempotent sub-flow causes a flow restart, the flow will be
replayed from the last checkpoint before the sub-flow invocation.
However, the logic between the last checkpoint and the sub-flow invocation
may contain side-effects which shouldn't be replayed. Thus we need to persist
a checkpoint just before an idempotent sub-flow is invoked.
2018-06-19 16:42:55 +01:00
szymonsztuka
b18af16325
Guidelines for plausible Corda extension to support other database without recompilation (related to ENT-1428). (#1013)
Guidelines for adding support to other database without recompiling Corda source code.
2018-06-19 16:32:51 +01:00
Viktor Kolomeyko
d4b982b9fb
ENT-2054: Logging improvements (#3397) 2018-06-19 15:29:35 +01:00
Tudor Malene
1004c0f534
CORDA-1407 Mark method as CordaInternal (#3402) 2018-06-19 14:57:03 +01:00
szymonsztuka
75665016f6
Merge pull request #1017 from corda/merges/2018-06-19-2dded2a
OS -> ENT merge on 2018-06-19 up to 2dded2m
2018-06-19 14:03:43 +01:00
Clinton Alexander
8f2e457f0d Removed some vestigal jolokia code from the webserver. 2018-06-19 13:49:42 +01:00
szymonsztuka
56e1f6c650 CORDA-1407 Node Explorer - fix total column 2018-06-19 12:21:40 +01:00
Chris Rankin
8a74a55dca
Move JMeter search_paths.txt into project's own build directory. (#1014) 2018-06-19 11:59:46 +01:00
szymonsztuka
acefaceaf6 [CORDA-1605]: When one node in a transaction fails to respond, operator of initiating node needs to understand which node it is waiting for. 2018-06-19 11:59:01 +01:00
szymonsztuka
f99f483f0d Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-19-2dded2a 2018-06-19 11:18:28 +01:00
Michele Sollecito
2dded2aa28
[CORDA-1629]: Documented backup strategy recommendations for Corda platform components. (#3377) 2018-06-19 11:05:23 +01:00
szymonsztuka
fe705ef93d
Update to gradle-plugins to 4.0.24 (#3392)
* Fix ENT-2059 Cordform Gradle task ('deployNodes') doesn't work when 'configFile' element was used
* The 'node' entry has a new optional element 'drivers', which is a list of JAR files to be copied to the './driver' subdirectory relative to node directory (ENT-2035).
2018-06-19 10:57:49 +01:00
Tudor Malene
41776ed374
CORDA-1407 Node Explorer - fix total column (#3395) 2018-06-19 09:19:19 +01:00
Florian Friemel
e5a79f585e
Merge pull request #1012 from corda/os-merge-2018-06-18-17_42 2018-06-19 08:02:39 +01:00
Chris Rankin
176c784ded Fix Gradle for tools:jmeter. 2018-06-18 23:45:59 +01:00
Michele Sollecito
20aca788ce
[CORDA-1605]: When one node in a transaction fails to respond, operator of initiating node needs to understand which node it is waiting for (fix) (#3393) 2018-06-18 17:59:00 +01:00
Florian Friemel
ad76b7821e
Merge remote-tracking branch 'open/master' into os-merge-2018-06-18-17_42 2018-06-18 17:51:41 +01:00
Rick Parker
c7c38fd91c
ENT-2053 Fix messaging TTL related settings causing disconnects (#1011) 2018-06-18 17:40:03 +01:00
Florian Friemel
100008b139
[CORDA-1634] Destroy child processes when parent exits. (#3368)
* [CORDA-1634] Destroy child processes when parent exits.

* Add comment.

* Register Shutdownhook for processes regardless of whether the Driver was initialized with

* Add comment.

* Revert "Add comment."

This reverts commit a5e78c379fba4e132cb3287997e77e21a6600947.

* Add comment.

* Add shutdown hook in ShutdownManager.registerProcessShutdown.

* Initialize the ShutdownManager with a shutdown hook to ensure that  is called.

* Add comment.
2018-06-18 17:39:46 +01:00
Jonathan Sphar
56f47aaa0a remove network simulator references in docs (#3396) 2018-06-18 17:35:26 +01:00
Katelyn Baker
e12185139f
CORDA-1641 - Add Java example to proxy serializer documentation (#3390)
* CORDA-1641 - Add Java example to proxy serializer documentation

* Review comments
2018-06-18 16:09:31 +01:00
Rick Parker
41ffde01f0
Merge pull request #1010 from corda/parkri-os-merge-201806-15-1
OS -> ENT merge up to 999ee4980494f5012fa0f15d145bf667142cc0fc
2018-06-18 16:01:15 +01:00
Chris Rankin
6f149a38c9
ENT-1463: Upgrade to Kotlin 1.2.50 (#3383)
* Upgrade to Kotlin 1.2.50
* Remove methods whose implementations are now inherited.
2018-06-18 15:36:33 +01:00
Chris Rankin
9148d0529a
ENT-1463, ENT-1903: Refactor Gradle for deterministic modules (#3387)
* Export locations of both deterministic rt.jar and its JDK_HOME as properties.
* Refactor deterministic Java/Kotlin configuration into a script plugin.
2018-06-18 14:14:48 +01:00
Michele Sollecito
c2585e8c8e
[CORDA-1595]: If adminAddress is not included in rpcSettings configuration node fails with NullPointerException (fix). (#3385) 2018-06-18 13:41:31 +01:00
Anthony Keenan
a0c6de7758
CORDA-1498: serialization multiple transform bug (#3216)
* Fix issue when evolving enums with transformation chains

* Regenerate test data for deserializeWithRename test and unignore

* Further tweaks / remove debugging

* Formatting tweaks

* Address review comments

* Remove debug

* Add classname to serialization tranform exceptions

* Use direct node links instead of indexes to improve readability

* More readability tweaks

* More readability improvements

* rename require to requireThat to resolve conflict with kotlin libraries

* Add logging of error message

* Change requireThat helper to inline function

* remove unneeded toString

* Further tweaks

* Change NotSerializableException to more generic IOException

* Make exception context clearer
2018-06-18 13:34:35 +01:00
Chris Rankin
71e7784519
ENT-1467: Document how to configure IntelliJ with a deterministic SDK. (#3371)
* Allow deterministic modules to use a deterministic IntelliJ SDK.
* Document how to configure IntelliJ with a deterministic SDK.
* Small clarifications to deterministic IntelliJ SDK documentation.
2018-06-18 12:40:35 +01:00
Katelyn Baker
701d8426df
CORDA-1640 - Proxy serializer documentation (#3389) 2018-06-18 12:18:24 +01:00
rick.parker
14e30a9e65 Fix failing unit test missing some mocked attributes. 2018-06-18 10:30:16 +01:00
rick.parker
597442cc0b Disable experimental/intellij-plugin since it causes a NoClassDefFoundError in gradle and upgrading the plugin didn't seem to help. 2018-06-15 17:35:17 +01:00
rick.parker
3a390e3643 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-201806-15-1 2018-06-15 17:06:09 +01:00
Rick Parker
999ee49804
ENT-2053 Fix messaging TTL related settings causing disconnects (#3384)
* ENT-2053 Revert RPC TTL due to hanging RPC clients.

* ENT-2053 Set TTL correctly.
2018-06-15 16:57:49 +01:00
Stefano Franz
d054238f19
ENT-2013 fix issue when a node is restarted with the same entity, but different keypair (#3319)
* fix issue when a node is restarted with the same entity, but different keypair

* address review comment

* remove incorrect test
2018-06-15 16:01:56 +01:00
Joel Dudley
1bb2037794
Modifies warning around use of PostgreSQL (#3388) 2018-06-15 15:02:34 +01:00
Rick Parker
92d44bf68a
CORDA-1622 Fix misuse of volatile (#3375) 2018-06-15 14:51:47 +01:00