Merge remote-tracking branch 'open/master' into shams-os-merge-040118

node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializationHelper.kt

@@ -85,7 +85,7 @@ private fun <T : Any> propertiesForSerializationFromConstructor(kotlinConstructo
         val matchingProperty = properties[name] ?:
                 try {
                     clazz.getDeclaredField(param.name)
-                    throw NotSerializableException("Property '$name' or it's getter is non public, this renders class '$clazz' unserializable")
+                    throw NotSerializableException("Property '$name' or its getter is non public, this renders class '$clazz' unserializable")
                 } catch (e: NoSuchFieldException) {
                     throw NotSerializableException("No property matching constructor parameter named '$name' of '$clazz'. " +
                             "If using Java, check that you have the -parameters option specified in the Java compiler. " +

node-api/src/test/java/net/corda/nodeapi/internal/serialization/amqp/ErrorMessageTests.java

@@ -10,7 +10,7 @@ public class ErrorMessageTests {
     private String errMsg(String property, String testname) {
         return "Property '"
                 + property
-                + "' or it's getter is non public, this renders class 'class "
+                + "' or its getter is non public, this renders class 'class "
                 + testname
                 + "$C' unserializable -> class "
                 + testname

node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/ErrorMessagesTests.kt

@@ -10,7 +10,7 @@ class ErrorMessagesTests {
     }
 
     private fun errMsg(property:String, testname: String) =
-            "Property '$property' or it's getter is non public, this renders class 'class $testname\$C' unserializable -> class $testname\$C"
+            "Property '$property' or its getter is non public, this renders class 'class $testname\$C' unserializable -> class $testname\$C"
 
     @Test
     fun privateProperty() {