mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-04 14:55:41 +02:00
[413178] UniversalFileTransferUtility isn't setting read-only bit if
encoding and timestamp are unchanged
This commit is contained in:
parent
53f07d052c
commit
14ade17e04
1 changed files with 8 additions and 8 deletions
|
@ -66,6 +66,7 @@
|
||||||
* David McKnight (IBM) - [386486] when the original timestamp of a file is 0 don't set it after an upload
|
* David McKnight (IBM) - [386486] when the original timestamp of a file is 0 don't set it after an upload
|
||||||
* David McKnight (IBM) - [389838] Fast folder transfer does not account for code page
|
* David McKnight (IBM) - [389838] Fast folder transfer does not account for code page
|
||||||
* Samuel Wu (IBM) - [402533] UniversalFileTransferUtility threw NPE
|
* Samuel Wu (IBM) - [402533] UniversalFileTransferUtility threw NPE
|
||||||
|
* David McKnight (IBM) - [413178] UniversalFileTransferUtility isn't setting read-only bit if encoding and timestamp are unchanged
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.files.ui.resources;
|
package org.eclipse.rse.files.ui.resources;
|
||||||
|
@ -721,16 +722,15 @@ public class UniversalFileTransferUtility {
|
||||||
String storedEncoding = properties.getEncoding();
|
String storedEncoding = properties.getEncoding();
|
||||||
String currentEncoding = srcFileOrFolder.getEncoding();
|
String currentEncoding = srcFileOrFolder.getEncoding();
|
||||||
|
|
||||||
if (storedTime != currentTime || (storedEncoding == null || !storedEncoding.equals(currentEncoding)))
|
|
||||||
{
|
|
||||||
if (tempFile.exists())
|
if (tempFile.exists())
|
||||||
{
|
{
|
||||||
// deal with encoding properties
|
|
||||||
if (storedEncoding == null || !storedEncoding.equals(currentEncoding)){
|
|
||||||
// set the appropriate readonly flag
|
// set the appropriate readonly flag
|
||||||
boolean readOnly = !srcFileOrFolder.canWrite();
|
boolean readOnly = !srcFileOrFolder.canWrite();
|
||||||
setReadOnly(tempFile, readOnly);
|
setReadOnly(tempFile, readOnly);
|
||||||
|
if (storedTime != currentTime || (storedEncoding == null || !storedEncoding.equals(currentEncoding)))
|
||||||
|
{
|
||||||
|
// deal with encoding properties
|
||||||
|
if (storedEncoding == null || !storedEncoding.equals(currentEncoding)){
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (remoteEncoding != null)
|
if (remoteEncoding != null)
|
||||||
|
|
Loading…
Add table
Reference in a new issue