Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions

View File

@@ -625,7 +625,7 @@ public class NonTransactionalRuleContentDiskDriver implements ExtendedDiskInterf
/**
* Get the driver state from the session.
* @param sess
* @param sess SrvSession
* @return the driver state.
*/
private DriverState getDriverState(SrvSession sess)
@@ -651,9 +651,9 @@ public class NonTransactionalRuleContentDiskDriver implements ExtendedDiskInterf
/**
* Get the evaluator context from the state and the folder.
* @param driverState
* @param folder
* @return
* @param driverState DriverState
* @param folder String
* @return EvaluatorContext
*/
private EvaluatorContext getEvaluatorContext(DriverState driverState, String folder)
{
@@ -675,9 +675,9 @@ public class NonTransactionalRuleContentDiskDriver implements ExtendedDiskInterf
/**
* Release the evaluator context if there are no active scenarios.
* @param driverState
* @param ctx
* @param folder
* @param driverState DriverState
* @param ctx EvaluatorContext
* @param folder String
*/
private void releaseEvaluatorContextIfEmpty(DriverState driverState, EvaluatorContext ctx, String folder)
{