Skip to content

Commit

Permalink
Review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Kat Baker committed Apr 12, 2018
1 parent c783c43 commit 03850da
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ release, see :doc:`upgrade-notes`.
Unreleased
==========

* Fix CORDA-1229. Setter based serialization was broken with generic types when the property was stored
as the interface type, List for example.
* Fix CORDA-1229. Setter-based serialization was broken with generic types when the property was stored
as the raw type, List for example.

* java.security.cert.CRLReason added to the default Whitelist.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ fun propertiesForSerializationFromSetters(
"${property.value.field?.genericType!!}")
}

// make sure the getter returns the same type (within inheritance bounds) the setter accepts
// Make sure the getter returns the same type (within inheritance bounds) the setter accepts.
if (!(TypeToken.of (getter.genericReturnType).isSupertypeOf(setterType))) {
throw NotSerializableException("Defined setter for parameter ${property.value.field?.name} " +
"takes parameter of type $setterType yet the defined getter returns a value of type " +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@ public void intList() throws NotSerializableException {
evolutionSerialiserGetter,
fingerPrinter);

// if we've got super / sub types on the setter vs the unerlaying type the wrong way around this will
// explode
// if we've got super / sub types on the setter vs the underlying type the wrong way around this will
// explode. See CORDA-1229 (https://r3-cev.atlassian.net/browse/CORDA-1229)
new SerializationOutput(factory1).serialize(cil);
}
}

0 comments on commit 03850da

Please sign in to comment.