提交 118ee240 编写于 作者: liyi_hz2008's avatar liyi_hz2008

[内容管理]修复在某些特殊情况下CMS权限控制出现死锁,导致权限不生效的问题。

上级 6839d496
...@@ -46,11 +46,11 @@ public class CmsBatchOperationPersistService { ...@@ -46,11 +46,11 @@ public class CmsBatchOperationPersistService {
emc.beginTransaction( CmsBatchOperation.class ); emc.beginTransaction( CmsBatchOperation.class );
emc.persist( cmsBatchOperation, CheckPersistType.all ); emc.persist( cmsBatchOperation, CheckPersistType.all );
emc.commit(); emc.commit();
//将批量操作信息压入队列
ThisApplication.queueBatchOperation.send( cmsBatchOperation );
} catch ( Exception e ) { } catch ( Exception e ) {
throw e; throw e;
} }
//将批量操作信息压入队列
ThisApplication.queueBatchOperation.send( cmsBatchOperation );
return cmsBatchOperation; return cmsBatchOperation;
} }
...@@ -74,8 +74,7 @@ public class CmsBatchOperationPersistService { ...@@ -74,8 +74,7 @@ public class CmsBatchOperationPersistService {
cmsBatchOperation.setErrorCount( 0 ); cmsBatchOperation.setErrorCount( 0 );
cmsBatchOperation.setIsRunning( false ); cmsBatchOperation.setIsRunning( false );
cmsBatchOperation.setOldInfo( oldInfo ); cmsBatchOperation.setOldInfo( oldInfo );
addOperation( cmsBatchOperation ); return addOperation( cmsBatchOperation ) ;
return cmsBatchOperation;
} }
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册