Spring/spring-data-gemfire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SGF-474 - Fix the NPE in the MappingPdxSerializer

Browse Source
This commit is contained in:
John Blum
2016-02-25 12:16:02 -08:00
parent 60c5f1f2d3
commit 53a1fc217a
4 changed files with 195 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java
View File

@@ -151,30 +151,26 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
new GemfirePropertyValueProvider(reader), null));
final PersistentPropertyAccessor accessor = new ConvertingPropertyAccessor(entity.getPropertyAccessor(instance),
getConversionService());
getConversionService());
entity.doWithProperties(new PropertyHandler<GemfirePersistentProperty>() {
@Override
public void doWithPersistentProperty(GemfirePersistentProperty persistentProperty) {
if (entity.isConstructorArgument(persistentProperty)) {
return;
}
if (!entity.isConstructorArgument(persistentProperty)) {
PdxSerializer customSerializer = getCustomSerializer(persistentProperty.getType());
PdxSerializer customSerializer = getCustomSerializer(persistentProperty.getType());
Object value;
Object value = null;
if (customSerializer != null) {
value = customSerializer.fromData(persistentProperty.getType(), reader);
}
else {
value = reader.readField(persistentProperty.getName());
}
try {
value = (customSerializer != null
? customSerializer.fromData(persistentProperty.getType(), reader)
: reader.readField(persistentProperty.getName()));
try {
accessor.setProperty(persistentProperty, value);
}
catch (Exception e) {
throw new MappingException("Could not read value " + value.toString(), e);
accessor.setProperty(persistentProperty, value);
}
catch (Exception e) {
throw new MappingException(String.format("Could not read and set value [%1$s] for property [%2$s]",
value, persistentProperty.getName()), e);
}
}
}
});
@@ -190,9 +186,8 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
*/
@Override
public boolean toData(Object value, final PdxWriter writer) {
GemfirePersistentEntity<?> entity = getPersistentEntity(value.getClass());
final PersistentPropertyAccessor accessor = new ConvertingPropertyAccessor(entity.getPropertyAccessor(value),
getConversionService());
@@ -214,8 +209,8 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
}
}
catch (Exception e) {
throw new MappingException(String.format("Could not write value for property %1$s",
persistentProperty), e);
throw new MappingException(String.format("Could not write value for property [%1$s]",
persistentProperty.getName()), e);
}
}
});