diff --git a/box.json b/box.json index 617b3bf..fdd3826 100644 --- a/box.json +++ b/box.json @@ -1,6 +1,6 @@ { "name":"Amazon S3 SDK", - "version":"5.8.0", + "version":"5.8.1", "slug":"s3sdk", "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/s3sdk/@build.version@/s3sdk-@build.version@.zip", "author":"Ortus Solutions, Corp", diff --git a/models/AmazonS3.cfc b/models/AmazonS3.cfc index 026a48a..25e11e6 100644 --- a/models/AmazonS3.cfc +++ b/models/AmazonS3.cfc @@ -430,7 +430,8 @@ component accessors="true" singleton { "type" : node.grantee.XMLAttributes[ "xsi:type" ], "displayName" : "", "permission" : node.permission.XMLText, - "uri" : node.grantee.XMLAttributes[ "xsi:type" ] == "Group" ? node.grantee.uri.xmlText : node.grantee.displayName.xmlText + // TODO: + "uri" : node.grantee.XMLAttributes[ "xsi:type" ] == "Group" ? node.grantee.uri.xmlText : ( node.grantee.displayName.xmlText ?: node.grantee.ID.xmlText ) }; } ); } @@ -1776,7 +1777,7 @@ component accessors="true" singleton { throw( type = "S3SDKError", message = "Error making Amazon REST Call: #results.message#", - detail = serializeJSON( results.response ) + detail = isXML( results.response ) ? toString( results.response ) : serializeJSON( results.response ) ); }