Possible fix for ALF-4409: Locale-independent properties can be given different locales

- 3.4 de-Hibernate problem
 - The DAO was not *ever* persisting '.default' so could give back different IDs for getOrCreateDefaultLocale().
 - Obviously, the NodeService (and all other clients) would expect the same ID for the default locale.
 - No need to change the NodeService property code - it's behaving correctly.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-08-25 08:41:22 +00:00
parent df45c7cb23
commit a82a04c9a6
3 changed files with 78 additions and 126 deletions

View File

@@ -26,8 +26,8 @@ package org.alfresco.repo.domain.locale;
import java.util.Locale;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.util.Pair;
import org.springframework.dao.DataIntegrityViolationException;
/**
* Data abstraction layer for Locale entities.
@@ -39,8 +39,8 @@ public interface LocaleDAO
{
/**
* @param id the unique ID of the entity
* @return the locale (never null)
* @throws AlfrescoRuntimeException if the ID provided is invalid
* @return the locale pair (never null)
* @throws DataIntegrityViolationException if the ID provided is invalid
*/
Pair<Long, Locale> getLocalePair(Long id);
@@ -62,8 +62,7 @@ public interface LocaleDAO
* Gets the locale ID for an existing instance or creates a new entity if
* one doesn't exist.
*
* @param id the locale to fetch or <tt>null</tt> to get or create the default
* locale.
* @param locale the locale to fetch or <tt>null</tt> to get or create the default locale.
* @return the locale - never <tt>null</tt>
*/
Pair<Long, Locale> getOrCreateLocalePair(Locale locale);