projects
/
jpa-converters
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevented possible NullPointerException's
[jpa-converters]
/
src
/
main
/
java
/
de
/
juplo
/
jpa
/
converters
/
LocaleConverter.java
diff --git
a/src/main/java/de/juplo/jpa/converters/LocaleConverter.java
b/src/main/java/de/juplo/jpa/converters/LocaleConverter.java
index
da84d15
..
0174e99
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/LocaleConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/LocaleConverter.java
@@
-16,12
+16,16
@@
public class LocaleConverter implements AttributeConverter<Locale, String>
@Override
public String convertToDatabaseColumn(Locale locale)
{
@Override
public String convertToDatabaseColumn(Locale locale)
{
+ if (locale == null)
+ return null;
return locale.toLanguageTag();
}
@Override
public Locale convertToEntityAttribute(String string)
{
return locale.toLanguageTag();
}
@Override
public Locale convertToEntityAttribute(String string)
{
+ if (string == null)
+ return null;
return Locale.forLanguageTag(string);
}
}
return Locale.forLanguageTag(string);
}
}