inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.1-BUG-FIX to HEAD

Browse Source 
40440: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40438: Merged PATCHES/V3.4.9 to V3.4-BUG-FIX
         40431: ALF-15464: Reverse merged the following revisions due to broken protocol stack     
            ALF-15311: 39885:  JGroups resends incorrect message for XMIT_REQ       
               - Added new configuration files for heartbeat channel that removes NAKACK protocol as guaranteed delivery is not necessary for heartbeat.
   40441: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40439: ALF-15508: Merged PATCHES/3.4.9 to V3.4-BUG-FIX
         40432: ALF-15464: JGroups resends incorrect message for XMIT_REQ    
            - Changed JGroupsKeepAliveHeartbeatSender to copy the message for every send.
   40453: ALF-11562 Calendar mistakenly deleted some information for the recurrence String.
   40475: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40350: ALF-15244: Make Thai text searchable
      40357: ALF-14]588: Changing case of folder/filename fails on WebDAV 
   40476: Merged V4.1 to V4.1-BUG-FIX (RECORD ONLY)
      40442: Merged V4.1-BUG-FIX to V4.1
         40441: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
            40439: ALF-15508: Merged PATCHES/3.4.9 to V3.4-BUG-FIX
               40432: ALF-15464: JGroups resends incorrect message for XMIT_REQ    
                  - Changed JGroupsKeepAliveHeartbeatSender to copy the message for every send.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-08-16 07:48:56 +00:00
parent 45514f13e2
commit ccd1f23a41
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java
View File

@@ -186,6 +186,7 @@ public class CalendarEntryGet extends AbstractCalendarWebScript
}
else if (params.get("BYSETPOS") != null)
{
text.append("Occurs the ");
text.append(weeks.get((Integer.parseInt(params.get("BYSETPOS")))) + " ");
text.append(days.get(params.get("BYDAY")));
}

36
source/java/org/alfresco/repo/webdav/AbstractMoveOrCopyMethod.java
View File

@@ -114,29 +114,27 @@ public abstract class AbstractMoveOrCopyMethod extends HierarchicalMethod
try
{
destInfo = getDAVHelper().getNodeForPath(rootNodeRef, destPath, servletPath);
// ALF-7079 fix, if destInfo is working copy then content will be updated later
boolean isDestWorkingCopy = getNodeService().hasAspect(destInfo.getNodeRef(), ContentModel.ASPECT_WORKING_COPY);
if (!hasOverWrite() && !isDestWorkingCopy)
if (!destInfo.getNodeRef().equals(sourceInfo.getNodeRef()))
{
if (logger.isDebugEnabled())
// ALF-7079 fix, if destInfo is working copy then content will be updated later
boolean isDestWorkingCopy = getNodeService().hasAspect(destInfo.getNodeRef(), ContentModel.ASPECT_WORKING_COPY);
if (!hasOverWrite() && !isDestWorkingCopy)
{
logger.debug("Destination exists but overwrite is not allowed");
if (logger.isDebugEnabled())
{
logger.debug("Destination exists but overwrite is not allowed");
}
// it exists and we may not overwrite
throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
}
// it exists and we may not overwrite
throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
}
// delete the destination node if it is not the same as the source node and not a working copy
if (!destInfo.getNodeRef().equals(sourceInfo.getNodeRef()) && !isDestWorkingCopy &&
!isShuffleOperation(sourceInfo) && !isVersioned(destInfo))
{
checkNode(destInfo);
// delete the destination node if it is not the same as the source node and not a working copy
if (!isDestWorkingCopy && !isShuffleOperation(sourceInfo) && !isVersioned(destInfo))
{
checkNode(destInfo);
// attempting to move or copy onto another node
fileFolderService.delete(destInfo.getNodeRef());
}
else
{
// it is a copy or move onto itself
// attempting to move or copy onto another node
fileFolderService.delete(destInfo.getNodeRef());
}
}
}
catch (FileNotFoundException e)