Merged V2.1 to HEAD

6413: ML copy code switches off the MLPropertyInterceptor whilst copying
   6416: WCM-709 CIFS automount comment 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6422 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-08-06 10:01:00 +00:00
parent 7ffe085354
commit cb7bfbec70
2 changed files with 17 additions and 2 deletions

View File

@@ -88,10 +88,14 @@ public class MLPropertyInterceptor implements MethodInterceptor
*
* @param mlAwareVal <tt>true</tt> if the current thread is able to handle
* {@link MLText d:mltext} property types, otherwise <tt>false</tt>.
* @return
* <tt>true</tt> if the current transaction is ML aware
*/
static public void setMLAware(boolean mlAwareVal)
static public boolean setMLAware(boolean mlAwareVal)
{
mlAware.set(new Boolean(mlAwareVal));
boolean wasMLAware = isMLAware();
mlAware.set(Boolean.valueOf(mlAwareVal));
return wasMLAware;
}
/**