Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-11484 - Fix LocaleTypeDescriptor to handle Locale.ROOT

This commit is contained in:
Benoit Lateltin 2017-02-13 13:08:51 +01:00 committed by Vlad Mihalcea
parent 3adb0d76be
commit 3c2939f0e5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleTypeDescriptor.java
View File

@ -13,7 +13,7 @@ import org.hibernate.type.descriptor.WrapperOptions;
/**
* Descriptor for {@link Locale} handling.
*
*
* @author Steve Ebersole
*/
public class LocaleTypeDescriptor extends AbstractTypeDescriptor<Locale> {
@ -43,10 +43,14 @@ public class LocaleTypeDescriptor extends AbstractTypeDescriptor<Locale> {
public Locale fromString(String string) {
// TODO : Ultimately switch to Locale.Builder for this. However, Locale.Builder is Java 7
if ( string == null || string.isEmpty() ) {
if ( string == null ) {
return null;
}
if( string.isEmpty() ) {
return Locale.ROOT;
}
boolean separatorFound = false;
int position = 0;
char[] chars = string.toCharArray();

2
hibernate-core/src/test/java/org/hibernate/test/type/descriptor/java/LocaleTypeDescriptorTest.java
View File

@ -32,6 +32,8 @@ public class LocaleTypeDescriptorTest extends BaseUnitTestCase {
assertEquals( toLocale( null, "DE", "ch123" ), LocaleTypeDescriptor.INSTANCE.fromString( "_DE_ch123" ) );
assertEquals( toLocale( "de", null, "ch123" ), LocaleTypeDescriptor.INSTANCE.fromString( "de__ch123" ) );
assertEquals( toLocale( "de", "DE", "ch123" ), LocaleTypeDescriptor.INSTANCE.fromString( "de_DE_ch123" ) );
assertEquals( toLocale( "", "", "" ), LocaleTypeDescriptor.INSTANCE.fromString( "" ) );
assertEquals( Locale.ROOT, LocaleTypeDescriptor.INSTANCE.fromString( "" ) );
}
public Locale toLocale(String lang, String region, String variant) {