Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion box.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
5 changes: 3 additions & 2 deletions models/AmazonS3.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
};
} );
}
Expand Down Expand Up @@ -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 )
);
}

Expand Down
Loading