diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ByteArrayAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ByteArrayAttributeConverter.java index 2cf110a6814..442b30f1de1 100644 --- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ByteArrayAttributeConverter.java +++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ByteArrayAttributeConverter.java @@ -69,7 +69,7 @@ public AttributeValue transformFrom(byte[] input) { @Override public byte[] transformTo(AttributeValue input) { if (input.b() != null) { - return EnhancedAttributeValue.fromBytes(input.b()).convert(VISITOR); + return input.b().asByteArray(); } return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR); diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringAttributeConverter.java index 4d8da920d6a..590f1362d99 100644 --- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringAttributeConverter.java +++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringAttributeConverter.java @@ -70,7 +70,10 @@ public AttributeValue transformFrom(String input) { @Override public String transformTo(AttributeValue input) { - return Visitor.toString(input); + if (input.s() != null) { + return input.s(); + } + return EnhancedAttributeValue.fromAttributeValue(input).convert(Visitor.INSTANCE); } private static final class Visitor extends TypeConvertingVisitor {