浏览代码

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

o2lee 5 年之前
父节点
当前提交
d1a5fcc6cd

+ 4 - 5
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CmsBatchOperationPersistService.java

@@ -46,11 +46,11 @@ public class CmsBatchOperationPersistService {
 			emc.beginTransaction( CmsBatchOperation.class );
 			emc.persist( cmsBatchOperation, CheckPersistType.all ); 
 			emc.commit();
-			//将批量操作信息压入队列
-			ThisApplication.queueBatchOperation.send( cmsBatchOperation );
 		} catch ( Exception e ) {
 			throw e;
-		}		
+		}
+		//将批量操作信息压入队列
+		ThisApplication.queueBatchOperation.send( cmsBatchOperation );
 		return cmsBatchOperation;
 	}
 	
@@ -74,8 +74,7 @@ public class CmsBatchOperationPersistService {
 		cmsBatchOperation.setErrorCount( 0 );
 		cmsBatchOperation.setIsRunning( false );
 		cmsBatchOperation.setOldInfo( oldInfo );
-		addOperation( cmsBatchOperation );	
-		return cmsBatchOperation;
+		return addOperation( cmsBatchOperation ) ;
 	}
 	
 	/**