mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V4.0-BUG-FIX to HEAD
34060: Merged V4.0 (4.0) to 4.0-BUG-FIX (4.0.1) <<< NOTE ALF-12939 still needs to be done to complete this merge to 4.0.1 >>>
33056: Fix for ALF-12280: Upgrading from version 3.4.7 to 4.0.0 failed with MS SQL database
- Added dialect-specific script for SQL Server
33059: Fix for ALF-12127, ALF-11161, ALF-11988
Merged BRANCHES/DEV/THOR1 to BRANCHES/V4.0
33049: Fixed follow issues on THOR-839 & THOR-826
- Following webscripts now sets "Content-Type" response header to application/json
- which makes people search display follow buttons for people correctly
Fix for ALF-12077
Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
32999: Fix for ALF-12050 - IE specific handling of Ajax requests does not correctly respect no-cache setting, need to set Expires header also
33060: Fix for ALF-12208 - group name encoding
33072: Merge from HEAD to V4.0
33071: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
- Fixed build failure in HeartBeat. It had relied on the fact that the previous LicenseComponent kept calling onLicenseChange every time
the license was checked. It needed the check 1 minute after the initial bootstrap call as there was a memory model sync issue in the
HeartBeat constructor to do with setting the URL it needed to call.
33073: Fix for ALF-12295 - CLONE - Upload issue ? - Failed to get content ... (No such file or directory) ... x22
33083: Merge from HEAD to V4.0
33082: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
- Did not refresh Tortoise window, this file was missed in the last commit
33080: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
- On reflection decided to call onLicenseChange every time the license is checked.
A change of valid license would not have resulted in a call to onLicenseChange
Also have been able to make failure and success code more symmetrical.
- The previous commit also added a RetryingTransaction around the sendData() call to
currentRepoDescriptorDAO.getLicenseKey() which I found while making the HeartBeat
changes. As a result we should no longer see the error in 4.0 about there not being a
transaction.
33087: Calendar: Permissions updates, fixes: ALF-12179 & makes the permissions flag boolean.
33088: FIXED : ALF-11862: An error message appears when you open the "edit task", to request to join the "moderated site"
Now handles null value
33102: Fix for ACT #15024-37148 (will update with JIRA no. once available)
- issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers.
33105: Bitrock license notice file.
33114: Merged DEV to V4.0
33067: Fix ALF-12206: CMIS: Error getting association information referencing archived node
33122: Fix for ALF-12316 Repo -> SOLR query uses HTTPClient that only supports 2 simultaneous connections
- configurable via spring (default if unconfigured is 40 connections to one host and 40 max connections)
33142: ALF-12339: Prevents ArrayOutOfBoundsException that can occur with concurrent access of i18n bundle in WebScript
34065: Fix for ALF-12708 (part 2)
- Alfresco opencmis extensions library
34093: ALF-10902 : CIFS: No friendly notification occurs when Editor or Collaborator tries to delete content
34120: ALF-12767 : CIFS TextEdit - File has been modified outside TextEdit
34125: Merged BRANCHES\V4.0 to BRANCHES\DEV\V4.0-BUG-FIX
34094: Fix for ALF-12944 OpenCMIS - CMIS-QL - Range queries for date and datetime properties fail
34095: Fix for ALF-12944 OpenCMIS - CMIS-QL - Range queries for date and datetime properties fail
- caught incorrect exception - so much for reading the Java Doc :-)
- build fix
34138: ALF-564 : Is network-protocol-context.xml still useful ?
34149: Removes more server side rendered dates:
Fixes: ALF-12965, ALF-12984, ALF-12988.
34158: Fix for ALF-12741 - Steck specific : error on managing groups
34176: Merged BRANCHES\V4.0 to BRANCHES\DEV\V4.0-BUG-FIX
34155: Fix for ALF-12979 CLONE - Search - searching in site without any images for *.jpg brings back all the documents
- note this relies on wildcard/prefix/term/phrase all going through the phrase implementation for wildcard from ALF-12162
34193: Fix for ALF-12205
34196: Fix for ALF-12758
34201: ALF-12892: Ensure that document permissions are refreshed in the dialog after being changed
34214: Switched off the CIFS Kerberos ticket cracking code by default, added a config value to enable it, latest JVMs do not require this. Part of ALF-12294.
CIFS Kerberos authentication now works with the IBM JDK.
34215: Switched off the CIFS Kerberos ticket cracking code by default, added a property to enable it, latest JVMs do not require this. Part of ALF-12294.
CIFS Kerberos authentication now works with the IBM JDK (and OpenJDK, Oracle/Sun JVMs)
34219: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX:
32096: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
32125: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
34220: Minor: follow-on to r34219 (ALF-11563)
34226: ALF-12780: Mac OS X Lion 10.7.2: Editing a document via CIFS and TextEdit removes versionable aspect from this file
34228: ALF-12689: Fixed character encoding issue with dynamic welcome dashlet
34237: ALF-12740: Updated XHR requests to include a noCache request parameter to address IE issue where 304 reponse is assumed for XHR request
34240: ALF-12835: Second click in status box no longer clears status
34241: ALF-11991: Updated DocLib to support categories
34245: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
34246: Reverse merge of BRANCHES/DEV/V4.0-BUG-FIX -c 34245
Due to an 'svn commit' command argument ordering error, I checked in the solrcore.properties files. This reverse merge removes those changes.
34247: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
34249: ALF-12782 : IMAP - No friendly notification occurs when a user without delete permissions tries to delete content
34254: Fix for ALF-13090 SOLR - cross tokenisation field matches too much for "*u*a"
34262: Fixes: ALF-11557: Publishing Balloon popups appearing in wrong locations. Now appears in correct location in Doc Lib & replaced with standard popup message on Channel Admin page.
34279: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
- if orphaned nodes are identified (eg. via getPath(s)) then attempt partial recovery by placing them in (temp) lost_found
- ... ALF-12358 ('child' node has deleted parent(s))
- ... ALF-13066 (non-root 'child' node has no parent(s))
- for internal use only - allows index tracking (eg. Solr) to continue
- precursor to fixing underlying root causes
- includes merge & extension of "testConcurrentLinkToDeletedNode" (from DEV/DEREK/ALF-12358)
34298: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
34068: Fix for ALF-342 - Entering a search containing a double quote displays pop-up 500 error in OpenSearch JSF component
34069: Fix for ALF-342 - Completed fix with additional encoded of output HTML
34070: Fix for ALF-12553 - Users are unable to see more than 100 sites under 'My Sites' page. List length now configurable.
34080: Fix for ALF-10306 - Share Advanced search issue with the Date Range form values
34107: Added missing jar lib to wcmquickstart and webeditor dependencies
34114: Fix for ALF-10284 - User should be informed when user provides invalid credentials while opening document using link
34151: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
34121: Merged BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4 (3.4.8)
Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
34100: ALF-12948 : Copyright year on "About Alfresco" page is out of date
Updated copyright year to 2012.
34150: ALF-10976 (relates to ALF-10412)
- Thumbnail mimetype check should have been >= 0 not > 0.
34171: ALF-13016 : TestModel class exits with a return code of 0 even if model fails validation.
34190: A modifiable map that protects and underlying map from modification
- When cloning the backing map (in the event of an potentially-modifying operation) keys and values
are specifically checked for mutability to prevent excessive cloning.
- Working towards fix for ALF-12855
34191: Fix ALF-12855: Improvement for Lucene in memory sorting and improvement for nodeService.getProperty()
- Use ValueProtectingMap when passing values out of the NodeDAO
- Solves the problem of map cloning when used internally as well as when calling NodeService.getProperty()
- If client code retrieves immutable values from the properties, then they will not be cloned
- TODO: Special handling of entrySet() and keySet() methods (see ALF-12868) to prevent interceptors from
triggering map cloning
34230: Fixes: ALF-12520. Adds i18n strings for siteModel
34253: Fix for ALF-13102 - JBoss: Unathorized responce recieved on a wcs/touch request with clustered alfrescos (ntlm sso enabled).
34272: ALF-13136 Merged V3.4.7 (3.4.7.5) to V3.4-BUG-FIX (3.4.9)
34267: ALF-12419 "Garbage collector error" LockAcquisition on the OrphanReaper process
- Modified OrphanReaper to use newer JobLockRefreshCallback.
Refresh lock every minute and timeout if it takes longer than an hour.
34281: ALF-13145: Merged PATCHES/V3.4.7 to V3.4-BUG-FIX
34273: ALF-13112: Groups are not displayed when 60k sites and 60 groups in the system
- Timeout adjustment approved by Kev and Erik
34291: Merged V3.4 to V3.4-BUG-FIX
34197: ALF-12900 Error occurs in My Documents dashlet
NodeRef (ScriptNode) passed to the doclist.get.js doesn't have any content. Not sure why yet.
Investigation continues, so there may be more changes to stop such nodes being passed in the first place.
NPE is as a result of having a nodeRef without content. It falls over on new code in 3.4.8 for ALF-10976 and ALF-10412.
Not too sure what would have happened in 3.4.7, but expect there world have been another exception in the transformer code.
- Addition of defensive code around contentData being null and the reader given to the transformer being null.
34198: ALF-12900 Error occurs in My Documents dashlet
- File missing from last commit
34242: ALF-13078 Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012
- Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
34265: Updated installer splash screen for 2012 (thanks Linton!)
34282: ALF-13059: Windows 7 specific: It's impossible to add documents to DWS
- Fix by Alex Malinovsky
34286: ALF-12949: Merged V4.0 to V3.4
34248: ALF-13102: NTLM on JBoss - Fix problem with Share SSO Authentication Filter corrupting cookie headers
34292: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
34284: ALF-12949: Merged V3.4-BUG-FIX to V3.4
34253: Fix for ALF-13102 - Surf mixing up cookies for different sessions
34299: Merged V4.0 to V4.0-BUG-FIX
34067: ALF-12423: Prevent script error on IE9
34102: SPANISH: Fixes minor encoding error
34115: Merged BRANCHES/DEV/BELARUS/V4.0-BUG-FIX-2012_01_20 to BRANCHES/V4.0:
34099: ALF-12710: Stack specific: It's impossible to log into CMIS Workbench through WebServices binding
34156: Missed from commit for r34154
34189: Fix for ALF-12822 - Script error when Add translation
34216: Fixes: ALF-11938 - A distinction needed making between the i18n labels for company address and personal address - I extended this to other company specific fields too.
34238: ALF-12864: Removed trailing spaces from installed jodconverter defaults
- Stopped forms from recognising booleans
34243: NFS, switch from read-only to writeable file if write access required and cached file was opened read-only. ALF-12193.
Fix I/O error saving from OpenOffice on Linux.
34263: Merged HEAD to V4.0
34250: Fixed THOR-1137 "Make Spring Surf enable-auto-deploy-modules by default"
34264: ALF-12975: alfresco-enterprise-4.0.1-installer-win-x64.exe / x32 installers fail
- Due to not detecting new stderr file
34278: ALF-12763: Re-applied change from ALF-7528 after it was lost in r28224 / ALF-5900
- PutMethod was modified to use only guessed mime type for documents and completely ignore the Content-Type header from client.
34303: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
33110: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0:
33109: ALF-11479: When upgrading from Alfresco Community 3.4.d to 4.0.b, some nodes that are blocked and have versions fail after the upgrade
33320: Merged BRANCHES\DEV\V4.0-BUG-FIX to BRANCHESV4.0
33305: ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0.
33326: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
33277 ALF-12468 CLONE - Regression. Searches cause database server to thrash CPU - ALF-12426
33331: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\V4.0
33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory
33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired()
33398: Merged V4.0-BUG-FIX to V4.0
33116: ALF-12517: Allow multiple deferred requests per oplock break, next level of fix for ALF-11935.
33147: FTP implemented set modification date/time command (MFMT). ALF-12105.
33151: Fix problems with FTP and UTF-8. JLAN-81.
When using the Java6 Normalizer use the NFC form.
33158: Fix NFS server swallows exceptions. ALF-11667.
Startup exception details are now saved.
33183: Minor fix to exception string in extendBuffer().
34061: Merged V4.0-BUG-FIX to V4.0 (Start of 4.0.1)
34062: Merge V4.0-BUG-FIX to V4.0 RECORD ONLY (changes that came from V4.0)
34109: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0
34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
Added missing jar lib to wcmquickstart and webeditor dependencies
34154: Merged BRANCHES/DEV/V4.0-BUG-FIX/ to BRANCHES/V4.0:
34149: Removes more server side rendered dates: Fixes: ALF-12965, ALF-12984, ALF-12988.
34274: Merged V4.0-BUG-FIX to V4.0
34237: ALF-12740: Updated XHR requests to include a noCache request parameter to address IE issue where 304 reponse is assumed for XHR request
34288: Merged V3.4 to V4.0
34197: ALF-12900 Error occurs in My Documents dashlet
NodeRef (ScriptNode) passed to the doclist.get.js doesn't have any content. Not sure why yet.
Investigation continues, so there may be more changes to stop such nodes being passed in the first place.
NPE is as a result of having a nodeRef without content. It falls over on new code in 3.4.8 for ALF-10976 and ALF-10412.
Not too sure what would have happened in 3.4.7, but expect there world have been another exception in the transformer code.
- Addition of defensive code around contentData being null and the reader given to the transformer being null.
34198: ALF-12900 Error occurs in My Documents dashlet
- File missing from last commit
34242: ALF-13078 Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012
- Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
34265: Updated installer splash screen for 2012 (thanks Linton!)
34284: ALF-12949: Merged V3.4-BUG-FIX to V3.4
34253: Fix for ALF-13102 - Surf mixing up cookies for different sessions
34286: ALF-12949: Merged V4.0 to V3.4
34248: ALF-13102: NTLM on JBoss - Fix problem with Share SSO Authentication Filter corrupting cookie headers
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
||||
* Copyright (C) 2005-2012 Alfresco Software Limited.
|
||||
*
|
||||
* This file is part of Alfresco
|
||||
*
|
||||
@@ -60,6 +60,7 @@ import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
|
||||
import org.alfresco.repo.transaction.TransactionAwareSingleton;
|
||||
import org.alfresco.repo.transaction.TransactionListenerAdapter;
|
||||
import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
|
||||
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||||
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.dictionary.InvalidTypeException;
|
||||
@@ -85,7 +86,7 @@ import org.alfresco.util.GUID;
|
||||
import org.alfresco.util.Pair;
|
||||
import org.alfresco.util.PropertyCheck;
|
||||
import org.alfresco.util.ReadWriteLockExecuter;
|
||||
import org.alfresco.util.SerializationUtils;
|
||||
import org.alfresco.util.ValueProtectingMap;
|
||||
import org.alfresco.util.EqualsHelper.MapValueComparison;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
@@ -992,9 +993,15 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
* @throws ConcurrencyFailureException if the ID doesn't reference a <b>live</b> node
|
||||
*/
|
||||
private Node getNodeNotNull(Long nodeId)
|
||||
{
|
||||
return getNodeNotNullImpl(nodeId, false);
|
||||
}
|
||||
|
||||
private Node getNodeNotNullImpl(Long nodeId, boolean deleted)
|
||||
{
|
||||
Pair<Long, Node> pair = nodesCache.getByKey(nodeId);
|
||||
if (pair == null || pair.getSecond().getDeleted())
|
||||
|
||||
if (pair == null || (pair.getSecond().getDeleted() && (!deleted)))
|
||||
{
|
||||
// Force a removal from the cache
|
||||
nodesCache.removeByKey(nodeId);
|
||||
@@ -1009,11 +1016,11 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new ConcurrencyFailureException(
|
||||
"No live node exists: \n" +
|
||||
logger.warn("No live node exists: \n" +
|
||||
" ID: " + nodeId + "\n" +
|
||||
" Cache row: " + pair.getSecond() + "\n" +
|
||||
" DB row: " + dbNode);
|
||||
throw new NotLiveNodeException(pair);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -1110,7 +1117,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
childNodeName = node.getUuid();
|
||||
}
|
||||
ChildAssocEntity assoc = newChildAssocImpl(
|
||||
parentNodeId, nodeId, true, assocTypeQName, assocQName, childNodeName);
|
||||
parentNodeId, nodeId, true, assocTypeQName, assocQName, childNodeName, false);
|
||||
|
||||
// There will be no other parent assocs
|
||||
boolean isRoot = false;
|
||||
@@ -1821,6 +1828,8 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
public Map<QName, Serializable> getNodeProperties(Long nodeId)
|
||||
{
|
||||
Map<QName, Serializable> props = getNodePropertiesCached(nodeId);
|
||||
// Create a shallow copy to allow additions
|
||||
props = new HashMap<QName, Serializable>(props);
|
||||
|
||||
Node node = getNodeNotNull(nodeId);
|
||||
// Handle sys:referenceable
|
||||
@@ -1838,6 +1847,10 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
props.putAll(auditableProperties.getAuditableProperties());
|
||||
}
|
||||
|
||||
// Wrap to ensure that we only clone values if the client attempts to modify
|
||||
// the map or retrieve values that might, themselves, be mutable
|
||||
props = new ValueProtectingMap<QName, Serializable>(props, NodePropertyValue.IMMUTABLE_CLASSES);
|
||||
|
||||
// Done
|
||||
if (isDebugEnabled)
|
||||
{
|
||||
@@ -1874,6 +1887,10 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
else
|
||||
{
|
||||
Map<QName, Serializable> props = getNodePropertiesCached(nodeId);
|
||||
// Wrap to ensure that we only clone values if the client attempts to modify
|
||||
// the map or retrieve values that might, themselves, be mutable
|
||||
props = new ValueProtectingMap<QName, Serializable>(props, NodePropertyValue.IMMUTABLE_CLASSES);
|
||||
// The 'get' here will clone the value if it is mutable
|
||||
value = props.get(propertyQName);
|
||||
}
|
||||
// Done
|
||||
@@ -2118,8 +2135,9 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
Map<QName, Serializable> propsToCache = null;
|
||||
if (isAddOnly)
|
||||
{
|
||||
// Copy cache properties for additions
|
||||
propsToCache = new HashMap<QName, Serializable>(oldPropsCached);
|
||||
// Combine the old and new properties
|
||||
propsToCache = oldPropsCached;
|
||||
propsToCache.putAll(propsToAdd);
|
||||
}
|
||||
else
|
||||
@@ -2194,10 +2212,13 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
{
|
||||
// Touch the node; all caches are fine
|
||||
touchNode(nodeId, null, null, false, false, false);
|
||||
// Update cache
|
||||
// Get cache props
|
||||
Map<QName, Serializable> cachedProps = getNodePropertiesCached(nodeId);
|
||||
cachedProps.keySet().removeAll(propertyQNames);
|
||||
setNodePropertiesCached(nodeId, cachedProps);
|
||||
// Remove deleted properties
|
||||
Map<QName, Serializable> props = new HashMap<QName, Serializable>(cachedProps);
|
||||
props.keySet().removeAll(propertyQNames);
|
||||
// Update cache
|
||||
setNodePropertiesCached(nodeId, props);
|
||||
}
|
||||
// Done
|
||||
return deleteCount > 0;
|
||||
@@ -2250,7 +2271,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Returns a writable copy of the cached property map
|
||||
* @return Returns the read-only cached property map
|
||||
*/
|
||||
private Map<QName, Serializable> getNodePropertiesCached(Long nodeId)
|
||||
{
|
||||
@@ -2261,11 +2282,9 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
invalidateNodeCaches(nodeId);
|
||||
throw new DataIntegrityViolationException("Invalid node ID: " + nodeId);
|
||||
}
|
||||
// We have the properties from the cache
|
||||
Map<QName, Serializable> cachedProperties = cacheEntry.getSecond();
|
||||
// Need to return a harmlessly mutable map
|
||||
Map<QName, Serializable> properties = copyPropertiesAgainstModification(cachedProperties);
|
||||
// Done
|
||||
return properties;
|
||||
return cachedProperties;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2277,7 +2296,6 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
private void setNodePropertiesCached(Long nodeId, Map<QName, Serializable> properties)
|
||||
{
|
||||
NodeVersionKey nodeVersionKey = getNodeNotNull(nodeId).getNodeVersionKey();
|
||||
properties = copyPropertiesAgainstModification(properties);
|
||||
propertiesCache.setValue(nodeVersionKey, Collections.unmodifiableMap(properties));
|
||||
}
|
||||
|
||||
@@ -2293,26 +2311,6 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Shallow-copies to a new map except for maps and collections that are binary serialized
|
||||
*/
|
||||
private Map<QName, Serializable> copyPropertiesAgainstModification(Map<QName, Serializable> original)
|
||||
{
|
||||
// Copy the values, ensuring that any collections are copied as well
|
||||
Map<QName, Serializable> copy = new HashMap<QName, Serializable>((int)(original.size() * 1.3));
|
||||
for (Map.Entry<QName, Serializable> element : original.entrySet())
|
||||
{
|
||||
QName key = element.getKey();
|
||||
Serializable value = element.getValue();
|
||||
if (value instanceof Collection<?> || value instanceof Map<?, ?>)
|
||||
{
|
||||
value = (Serializable) SerializationUtils.deserialize(SerializationUtils.serialize(value));
|
||||
}
|
||||
copy.put(key, value);
|
||||
}
|
||||
return copy;
|
||||
}
|
||||
|
||||
/**
|
||||
* Callback to cache node properties. The DAO callback only does the simple {@link #findByKey(Long)}.
|
||||
*
|
||||
@@ -2808,7 +2806,8 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
boolean isPrimary,
|
||||
final QName assocTypeQName,
|
||||
QName assocQName,
|
||||
final String childNodeName)
|
||||
final String childNodeName,
|
||||
boolean allowDeletedChild)
|
||||
{
|
||||
Assert.notNull(parentNodeId, "parentNodeId");
|
||||
Assert.notNull(childNodeId, "childNodeId");
|
||||
@@ -2818,7 +2817,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
|
||||
// Get parent and child nodes. We need them later, so just get them now.
|
||||
final Node parentNode = getNodeNotNull(parentNodeId);
|
||||
final Node childNode = getNodeNotNull(childNodeId);
|
||||
final Node childNode = getNodeNotNullImpl(childNodeId, allowDeletedChild);
|
||||
|
||||
final ChildAssocEntity assoc = new ChildAssocEntity();
|
||||
// Parent node
|
||||
@@ -2905,7 +2904,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
ParentAssocsInfo parentAssocInfo = getParentAssocsCached(childNodeId);
|
||||
// Create it
|
||||
ChildAssocEntity assoc = newChildAssocImpl(
|
||||
parentNodeId, childNodeId, false, assocTypeQName, assocQName, childNodeName);
|
||||
parentNodeId, childNodeId, false, assocTypeQName, assocQName, childNodeName, false);
|
||||
Long assocId = assoc.getId();
|
||||
// Touch the node; all caches are fine
|
||||
touchNode(childNodeId, null, null, false, false, false);
|
||||
@@ -3478,6 +3477,142 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
return paths;
|
||||
}
|
||||
|
||||
private void bindFixAssocAndCollectLostAndFound(final Pair<Long, NodeRef> lostNodePair, final String lostName, final ChildAssocEntity assoc)
|
||||
{
|
||||
AlfrescoTransactionSupport.bindListener(new TransactionListenerAdapter()
|
||||
{
|
||||
@Override
|
||||
public void afterRollback()
|
||||
{
|
||||
if (transactionService.getAllowWrite())
|
||||
{
|
||||
// New transaction
|
||||
RetryingTransactionCallback<Void> callback = new RetryingTransactionCallback<Void>()
|
||||
{
|
||||
public Void execute() throws Throwable
|
||||
{
|
||||
if (assoc == null)
|
||||
{
|
||||
// 'child' with missing parent assoc => collect lost+found orphan child
|
||||
collectLostAndFoundNode(lostNodePair, lostName);
|
||||
logger.error("ALF-13066: Orphan child node has been re-homed under lost_found: "+lostNodePair);
|
||||
}
|
||||
else
|
||||
{
|
||||
// 'child' with deleted parent assoc => delete invalid parent assoc and if primary then collect lost+found orphan child
|
||||
deleteChildAssoc(assoc.getId());
|
||||
logger.error("ALF-12358: Deleted parent - removed child assoc: "+assoc.getId());
|
||||
|
||||
if (assoc.isPrimary())
|
||||
{
|
||||
collectLostAndFoundNode(lostNodePair, lostName);
|
||||
logger.error("ALF-12358: Orphan child node has been re-homed under lost_found: "+lostNodePair);
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
};
|
||||
transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void collectLostAndFoundNode(Pair<Long, NodeRef> lostNodePair, String lostName)
|
||||
{
|
||||
Long childNodeId = lostNodePair.getFirst();
|
||||
NodeRef lostNodeRef = lostNodePair.getSecond();
|
||||
|
||||
Long newParentNodeId = getOrCreateLostAndFoundContainer(lostNodeRef.getStoreRef()).getId();
|
||||
|
||||
String assocName = lostName+"-"+System.currentTimeMillis();
|
||||
// Create new primary assoc (re-home the orphan node under lost_found)
|
||||
ChildAssocEntity assoc = newChildAssocImpl(newParentNodeId,
|
||||
childNodeId,
|
||||
true,
|
||||
ContentModel.ASSOC_CHILDREN,
|
||||
QName.createQName(assocName),
|
||||
assocName,
|
||||
true);
|
||||
|
||||
// Touch the node; all caches are fine
|
||||
touchNode(childNodeId, null, null, false, false, false);
|
||||
|
||||
// update cache
|
||||
boolean isRoot = false;
|
||||
boolean isStoreRoot = false;
|
||||
ParentAssocsInfo parentAssocInfo = new ParentAssocsInfo(isRoot, isStoreRoot, assoc);
|
||||
setParentAssocsCached(childNodeId, parentAssocInfo);
|
||||
|
||||
/*
|
||||
// Update ACLs for moved tree - note: actually a NOOP if oldParentAclId is null
|
||||
Long newParentAclId = newParentNode.getAclId();
|
||||
Long oldParentAclId = null; // unknown
|
||||
accessControlListDAO.updateInheritance(childNodeId, oldParentAclId, newParentAclId);
|
||||
*/
|
||||
}
|
||||
|
||||
private Node getOrCreateLostAndFoundContainer(StoreRef storeRef)
|
||||
{
|
||||
Pair<Long, NodeRef> rootNodePair = getRootNode(storeRef);
|
||||
Long rootParentNodeId = rootNodePair.getFirst();
|
||||
|
||||
final List<Pair<Long, NodeRef>> nodes = new ArrayList<Pair<Long, NodeRef>>(1);
|
||||
NodeDAO.ChildAssocRefQueryCallback callback = new NodeDAO.ChildAssocRefQueryCallback()
|
||||
{
|
||||
public boolean handle(
|
||||
Pair<Long, ChildAssociationRef> childAssocPair,
|
||||
Pair<Long, NodeRef> parentNodePair,
|
||||
Pair<Long, NodeRef> childNodePair
|
||||
)
|
||||
{
|
||||
nodes.add(childNodePair);
|
||||
// More results
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preLoadNodes()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean orderResults()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void done()
|
||||
{
|
||||
}
|
||||
};
|
||||
Set<QName> assocTypeQNames = new HashSet<QName>(1);
|
||||
assocTypeQNames.add(ContentModel.ASSOC_LOST_AND_FOUND);
|
||||
getChildAssocs(rootParentNodeId, assocTypeQNames, callback);
|
||||
|
||||
Node lostFoundNode = null;
|
||||
if (nodes.size() > 0)
|
||||
{
|
||||
lostFoundNode = getNodeNotNull(nodes.get(0).getFirst());
|
||||
|
||||
if (nodes.size() > 1)
|
||||
{
|
||||
logger.warn("More than one lost_found, using first: "+lostFoundNode.getNodeRef());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
lostFoundNode = newNode(rootParentNodeId, ContentModel.ASSOC_LOST_AND_FOUND, ContentModel.ASSOC_LOST_AND_FOUND, storeRef, null, ContentModel.TYPE_LOST_AND_FOUND, Locale.US, ContentModel.ASSOC_LOST_AND_FOUND.getLocalName(), null).getChildNode();
|
||||
|
||||
logger.info("Created lost_found: "+lostFoundNode.getNodeRef());
|
||||
}
|
||||
|
||||
return lostFoundNode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Build the paths for a node
|
||||
*
|
||||
@@ -3516,9 +3651,9 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
Pair<Long, NodeRef> rootNodePair = getRootNode(currentStoreRef);
|
||||
currentRootNodePair = new Pair<StoreRef, NodeRef>(currentStoreRef, rootNodePair.getSecond());
|
||||
}
|
||||
|
||||
|
||||
// get the parent associations of the given node
|
||||
ParentAssocsInfo parentAssocInfo = getParentAssocsCached(currentNodeId);
|
||||
ParentAssocsInfo parentAssocInfo = getParentAssocsCached(currentNodeId); // note: currently may throw NotLiveNodeException
|
||||
|
||||
// does the node have parents
|
||||
boolean hasParents = parentAssocInfo.getParentAssocs().size() > 0;
|
||||
@@ -3583,8 +3718,12 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
// Force a retry. The cached node was stale
|
||||
throw new DataIntegrityViolationException("Stale cache detected for Node #" + currentNodeId);
|
||||
}
|
||||
// We have a corrupt repository
|
||||
throw new RuntimeException("Node without parents does not have root aspect: " + currentNodeRef);
|
||||
|
||||
// We have a corrupt repository - non-root node has a missing parent ?!
|
||||
bindFixAssocAndCollectLostAndFound(currentNodePair, "nonRootNodeWithoutParents", null);
|
||||
|
||||
// throw - error will be logged and then bound txn listener (afterRollback) will be called
|
||||
throw new NonRootNodeWithoutParentsException(currentNodePair);
|
||||
}
|
||||
// walk up each parent association
|
||||
for (Map.Entry<Long, ChildAssocEntity> entry : parentAssocInfo.getParentAssocs().entrySet())
|
||||
@@ -3631,10 +3770,25 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
|
||||
" Prepending path parent: \n" +
|
||||
" Parent node: " + parentNodePair);
|
||||
}
|
||||
|
||||
|
||||
// push the assoc stack, recurse and pop
|
||||
assocIdStack.push(assocId);
|
||||
prependPaths(parentNodePair, currentRootNodePair, path, completedPaths, assocIdStack, primaryOnly);
|
||||
|
||||
try
|
||||
{
|
||||
prependPaths(parentNodePair, currentRootNodePair, path, completedPaths, assocIdStack, primaryOnly);
|
||||
}
|
||||
catch (final NotLiveNodeException re)
|
||||
{
|
||||
if (re.getNodePair().equals(parentNodePair))
|
||||
{
|
||||
// We have a corrupt repository - deleted parent pointing to live child ?!
|
||||
bindFixAssocAndCollectLostAndFound(currentNodePair, "childNodeWithDeletedParent", assoc);
|
||||
}
|
||||
// rethrow - this will cause error/rollback
|
||||
throw re;
|
||||
}
|
||||
|
||||
assocIdStack.pop();
|
||||
}
|
||||
// done
|
||||
|
||||
Reference in New Issue
Block a user