inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.0 to HEAD

Browse Source 
12083: Fix for ETHREEOH-790 - when using external auth such as NTLM the Change Password and Logout features are no longer available in the Share UI.
   12085: ETHREEOH-565: Failure to generate flash preview for PPT file
   12086: ETHREEOH-903 	 Sites drop-down Favorites UI improvements
          ETHREEOH-904 	 My Sites dashlet Favorites UI improvements
          ETHREEOH-547 	 User who is not a site manager can delete sites: my sites dashlet and sites page
   12093: ETHREEOH-861, ETHREEOH-928
   12094: Remove __MACOSX folder that has appeared in Share webapp
   12096: Removed spurious files from YUI 2.6.0 distribution
   12100: ETHREEOH-929   Tightening up transport adapters field (should never be shown for ASR)
   12104: Fix for ETHREEOH-944. Admin now able to reset user home location again ((regression).
   12105: Fixed: ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
   12106: Exception needs to be rethrown after releasing packet to the memory pool on a Winsock NetBIOS receive. ETHREEOH-628.
   12110: An i18n message didn't work for failures. Related to ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
   12115: Added unit test to check for cm:folder-derived type support
   12116: Removed unused, old patch-related query
   12117: Merged V2.2 to V3.0
      11454: Fixed ASH-7: QName fetching is inefficient when run without L2 cache
   12118: Fixed compilation error after merge
   12119: DM User Usages - 2nd pass (fix ETHREEOH-677)
   12122: UserUsage does nothing if system is READ-ONLY.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-12-18 17:10:36 +00:00
parent 9f42bfac4c
commit ab4bdfc013
38 changed files with 2011 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/node/AbstractNodeServiceImpl.java
View File

@@ -556,25 +556,17 @@ public abstract class AbstractNodeServiceImpl implements NodeService
}
/**
* Generates a GUID for the node using either the creation properties or just by
* generating a value randomly.
* Fetches any pre-defined node uuid from the properties, but <b>does not generate a new uuid</b>.
*
* @param preCreationProperties the properties that will be applied to the node
* @return Returns the ID to create the node with
* @return Returns the ID to create the node with, or <tt>null</tt> if a standard GUID should be used
*/
protected String generateGuid(Map<QName, Serializable> preCreationProperties)
{
String uuid = (String) preCreationProperties.get(ContentModel.PROP_NODE_UUID);
if (uuid == null)
if (uuid != null && uuid.length() > 50)
{
uuid = GUID.generate();
}
else
{
if (uuid.length() > 50)
{
throw new IllegalArgumentException("Explicit UUID may not be greater than 50 characters: " + uuid);
}
throw new IllegalArgumentException("Explicit UUID may not be greater than 50 characters: " + uuid);
}
// done
return uuid;