inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-30 18:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.1-BUG-FIX to HEAD

Browse Source 
47581: Merged DEV to V4.1-BUG-FIX (with corrections)
      47557: ALF-16846 : Checkout version from Microsoft Office does not work
      AlfrescoCheckOutCheckInServiceHandler.checkOutDocument() was changed. Now we unlock before checkout if current user is LOCK_OWNER and a node has a WRITE_LOCK lock type. 
   47584: Remove unused import
   47586: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      47583: Add serialVersionUID for Path$Element (see ALF-18265)
   47599: Set Surf version to 1.2.0-SNAPSHOT in POMs
   47616: Workaround ALF-16888: NodeServiceTest.testConcurrentArchive() failing on DB2
    - This test no longer runs on DB2
    - Unable to find configuration that allows it to succeed
   47640: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX
      47576: Merged DEV to PATCHES/V4.1.4
         47560: ALF-18248 : Upgrade from 3.2.2 to 4.1.4 fails with java.lang.NullPointerException when applying patch 'patch.thumbnailsAssocQName'
         Test for null value was added to the QNamePatch#applyInternal() method.
      47638: ALF-18258: Alfresco does not start with XAM module applied
      - Broke circular dependency in storeSelectorContentStoreBase
      47639: ALF-18249: Fixed performance-killing typo discovered by Kev!
      - One innocent ! sign got lost


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward 2013-03-06 12:20:33 +00:00
parent ca4089d895
commit 6652e37815
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/admin/patch/impl/QNamePatch.java
View File

@ -148,14 +148,13 @@ public class QNamePatch extends AbstractPatch
Pair<Long, QName> before = qnameDAO.getQName(qnameBefore);
for (Long i = 0L; i < maxNodeId; i+=BATCH_SIZE)
{
Work work = new Work(before.getFirst(), i);
retryingTransactionHelper.doInTransaction(work, false, true);
}
if (before != null)
{
for (Long i = 0L; i < maxNodeId; i+=BATCH_SIZE)
{
Work work = new Work(before.getFirst(), i);
retryingTransactionHelper.doInTransaction(work, false, true);
}
qnameDAO.updateQName(qnameBefore, qnameAfter);
}

1
source/java/org/alfresco/repo/content/ContentServiceImpl.java
View File

@ -39,7 +39,6 @@ import org.alfresco.repo.content.filestore.FileContentStore;
import org.alfresco.repo.content.filestore.FileContentWriter;
import org.alfresco.repo.content.transform.ContentTransformer;
import org.alfresco.repo.content.transform.ContentTransformerRegistry;
import org.alfresco.repo.content.transform.OOXMLThumbnailContentTransformer;
import org.alfresco.repo.content.transform.TransformerDebug;
import org.alfresco.repo.content.transform.UnimportantTransformException;
import org.alfresco.repo.node.NodeServicePolicies;

20
source/java/org/alfresco/repo/node/NodeServiceTest.java
View File

@ -79,6 +79,7 @@ import org.alfresco.util.Pair;
import org.alfresco.util.PropertyMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.dialect.Dialect;
import org.springframework.context.ApplicationContext;
import org.springframework.extensions.surf.util.I18NUtil;
@ -321,8 +322,13 @@ public class NodeServiceTest extends TestCase
assertEquals("", 3, paths.size());
}
static class InnerCallbackException extends RuntimeException
/**
* Test class to detect inner transaction failure
*/
private static class InnerCallbackException extends RuntimeException
{
private static final long serialVersionUID = 4993673371982008186L;
private final Throwable hiddenCause;
public InnerCallbackException(Throwable hiddenCause)
@ -343,12 +349,20 @@ public class NodeServiceTest extends TestCase
* open while we delete another in a new txn, thereby testing that DB locks don't prevent
* concurrent deletes.
* <p/>
* See: <a href="https://issues.alfresco.com/jira/browse/ALF-5714">ALF-5714</a>
*
* See: <a href="https://issues.alfresco.com/jira/browse/ALF-5714">ALF-5714</a><br/>
* See: <a href="https://issues.alfresco.com/jira/browse/ALF-16888">ALF-16888</a>
* <p/>
* Note: if this test hangs for MySQL then check if 'innodb_locks_unsafe_for_binlog = true' (and restart MySQL + test)
*/
public void testConcurrentArchive() throws Exception
{
Dialect dialect = (Dialect) ctx.getBean("dialect");
if (dialect.getClass().getName().contains("DB2"))
{
// See ALF-16888. DB2 fails this test persistently.
return;
}
final NodeRef workspaceRootNodeRef = nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
final NodeRef[] nodesPrimer = new NodeRef[1];
buildNodeHierarchy(workspaceRootNodeRef, nodesPrimer);

2
source/java/org/alfresco/repo/security/person/PersonServiceImpl.java
View File

@ -1715,7 +1715,7 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
private void putToCache(String userName, Set<NodeRef> refs)
{
String key = userName.toLowerCase();
if(AlfrescoTransactionSupport.getTransactionId() != null && TransactionalResourceHelper.getSet(DELETING_PERSON_SET_RESOURCE).contains(key))
if(AlfrescoTransactionSupport.getTransactionId() != null && !TransactionalResourceHelper.getSet(DELETING_PERSON_SET_RESOURCE).contains(key))
{
this.personCache.put(key, refs);
}