From 0fdcdaf37d8f7108e46ecac4e251b8fdc16722c5 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 23 Aug 2010 19:05:10 +0000 Subject: [PATCH] [279829] [local] Save conflict dialog keeps popping up on mounted drive --- .../rse/internal/services/local/files/LocalFileService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java index 0d685044a6d..fb7a9195bf1 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java @@ -46,6 +46,7 @@ * Martin Oberhuber (Wind River) - [286129][api] RemoteFileException(String) violates API contract * David McKnight (IBM) - [299140] Local Readonly file can't be copied/pasted twice * Martin Oberhuber (Wind River) - [314461] NPE deleting a folder w/o permission + * David McKnight (IBM) - [279829] [local] Save conflict dialog keeps popping up on mounted drive *******************************************************************************/ package org.eclipse.rse.internal.services.local.files; @@ -676,7 +677,9 @@ public class LocalFileService extends AbstractFileService implements ILocalServi throw new SystemOperationCancelledException(); // return false; } else if (destinationFile!=null) { - destinationFile.setLastModified(localFile.lastModified()); + // commented out as per the following bug: + // [279829] [local] Save conflict dialog keeps popping up on mounted drive + // destinationFile.setLastModified(localFile.lastModified()); //TODO check if we want to preserve permissions //if(!localFile.canWrite()) destinationFile.setReadOnly();