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

Fix merge fail.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2011-01-19 21:21:35 +00:00
parent 46c89b3789
commit cbba972229
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/action-services-context.xml
View File

@@ -336,9 +336,6 @@
<property name="transactionService"> <property name="transactionService">
<ref bean="TransactionService" /> <ref bean="TransactionService" />
</property> </property>
<property name="ignoreLock">
<value>false</value>
</property>
</bean> </bean>
<bean id="remove-features" class="org.alfresco.repo.action.executer.RemoveFeaturesActionExecuter" parent="action-executer"> <bean id="remove-features" class="org.alfresco.repo.action.executer.RemoveFeaturesActionExecuter" parent="action-executer">

6
source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
View File

@@ -444,6 +444,9 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getSystemUserName());
// Get the user
String userName = getUserName();
ruleService.disableRules(); ruleService.disableRules();
try try
{ {
@@ -460,9 +463,6 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService
ruleService.enableRules(); ruleService.enableRules();
} }
// Get the user
String userName = getUserName();
// Lock the original node // Lock the original node
this.lockService.lock(nodeRef, LockType.READ_ONLY_LOCK); this.lockService.lock(nodeRef, LockType.READ_ONLY_LOCK);