Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
23d02fd0
Commit
23d02fd0
authored
1 year ago
by
juanf
Browse files
Options
Downloads
Patches
Plain Diff
SSDM-13521: Trying to fix tests on ci that produce non reproducible errors on Mac
parent
3fe562b9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!40
SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib-commonbase/source/java/ch/systemsx/cisd/common/io/Posix.java
+7
-7
7 additions, 7 deletions
...monbase/source/java/ch/systemsx/cisd/common/io/Posix.java
with
7 additions
and
7 deletions
lib-commonbase/source/java/ch/systemsx/cisd/common/io/Posix.java
+
7
−
7
View file @
23d02fd0
...
@@ -323,8 +323,8 @@ public final class Posix
...
@@ -323,8 +323,8 @@ public final class Posix
FileTime
accessTime
=
FileTime
.
from
(
accessTimeInstant
);
FileTime
accessTime
=
FileTime
.
from
(
accessTimeInstant
);
Instant
modifiedTimeInstant
=
Instant
.
ofEpochSecond
(
modificationTimeSecs
).
plus
(
modificationTimeMicroSecs
,
ChronoUnit
.
MICROS
);
Instant
modifiedTimeInstant
=
Instant
.
ofEpochSecond
(
modificationTimeSecs
).
plus
(
modificationTimeMicroSecs
,
ChronoUnit
.
MICROS
);
FileTime
modifiedTime
=
FileTime
.
from
(
modifiedTimeInstant
);
FileTime
modifiedTime
=
FileTime
.
from
(
modifiedTimeInstant
);
Files
.
getFileAttributeView
(
Path
.
of
(
fileName
),
Ba
si
c
FileAttributeView
.
class
,
LinkOption
.
NOFOLLOW_LINKS
).
setTimes
(
modifiedTime
,
accessTime
,
null
);
Files
.
getFileAttributeView
(
Path
.
of
(
fileName
),
Po
si
x
FileAttributeView
.
class
,
LinkOption
.
NOFOLLOW_LINKS
).
setTimes
(
modifiedTime
,
accessTime
,
null
);
Files
.
getFileAttributeView
(
Path
.
of
(
fileName
),
Ba
si
c
FileAttributeView
.
class
).
setTimes
(
modifiedTime
,
accessTime
,
null
);
Files
.
getFileAttributeView
(
Path
.
of
(
fileName
),
Po
si
x
FileAttributeView
.
class
).
setTimes
(
modifiedTime
,
accessTime
,
null
);
}
catch
(
IOException
e
)
}
catch
(
IOException
e
)
{
{
throw
new
IOExceptionUnchecked
(
e
);
throw
new
IOExceptionUnchecked
(
e
);
...
@@ -361,7 +361,7 @@ public final class Posix
...
@@ -361,7 +361,7 @@ public final class Posix
FileTime
accessTime
=
FileTime
.
from
(
accessTimeInstant
);
FileTime
accessTime
=
FileTime
.
from
(
accessTimeInstant
);
Instant
modifiedTimeInstant
=
Instant
.
ofEpochSecond
(
modificationTimeSecs
).
plus
(
modificationTimeMicroSecs
,
ChronoUnit
.
MICROS
);
Instant
modifiedTimeInstant
=
Instant
.
ofEpochSecond
(
modificationTimeSecs
).
plus
(
modificationTimeMicroSecs
,
ChronoUnit
.
MICROS
);
FileTime
modifiedTime
=
FileTime
.
from
(
modifiedTimeInstant
);
FileTime
modifiedTime
=
FileTime
.
from
(
modifiedTimeInstant
);
Files
.
getFileAttributeView
(
Path
.
of
(
fileName
),
Ba
si
c
FileAttributeView
.
class
).
setTimes
(
modifiedTime
,
accessTime
,
null
);
Files
.
getFileAttributeView
(
Path
.
of
(
fileName
),
Po
si
x
FileAttributeView
.
class
).
setTimes
(
modifiedTime
,
accessTime
,
null
);
}
catch
(
IOException
e
)
}
catch
(
IOException
e
)
{
{
throw
new
IOExceptionUnchecked
(
e
);
throw
new
IOExceptionUnchecked
(
e
);
...
@@ -686,7 +686,7 @@ public final class Posix
...
@@ -686,7 +686,7 @@ public final class Posix
}
}
Ba
si
c
FileAttributes
attrs
=
null
;
Po
si
x
FileAttributes
attrs
=
null
;
FileLinkType
linkType
;
FileLinkType
linkType
;
short
permissions
;
short
permissions
;
int
uid
;
int
uid
;
...
@@ -694,7 +694,7 @@ public final class Posix
...
@@ -694,7 +694,7 @@ public final class Posix
if
(
readSymbolicLinkTarget
&&
Files
.
exists
(
path
))
if
(
readSymbolicLinkTarget
&&
Files
.
exists
(
path
))
{
{
permissions
=
getNumericAccessMode
(
Files
.
getPosixFilePermissions
(
path
));
permissions
=
getNumericAccessMode
(
Files
.
getPosixFilePermissions
(
path
));
attrs
=
Files
.
readAttributes
(
path
,
Ba
si
c
FileAttributes
.
class
);
attrs
=
Files
.
readAttributes
(
path
,
Po
si
x
FileAttributes
.
class
);
if
(
Files
.
isSymbolicLink
(
path
))
{
if
(
Files
.
isSymbolicLink
(
path
))
{
linkType
=
FileLinkType
.
SYMLINK
;
linkType
=
FileLinkType
.
SYMLINK
;
}
else
if
(
Files
.
isDirectory
(
path
))
{
}
else
if
(
Files
.
isDirectory
(
path
))
{
...
@@ -708,7 +708,7 @@ public final class Posix
...
@@ -708,7 +708,7 @@ public final class Posix
gid
=
getGid
(
pathAsString
);
gid
=
getGid
(
pathAsString
);
}
else
{
}
else
{
permissions
=
getNumericAccessMode
(
Files
.
getPosixFilePermissions
(
path
,
LinkOption
.
NOFOLLOW_LINKS
));
permissions
=
getNumericAccessMode
(
Files
.
getPosixFilePermissions
(
path
,
LinkOption
.
NOFOLLOW_LINKS
));
attrs
=
Files
.
readAttributes
(
path
,
Ba
si
c
FileAttributes
.
class
,
LinkOption
.
NOFOLLOW_LINKS
);
attrs
=
Files
.
readAttributes
(
path
,
Po
si
x
FileAttributes
.
class
,
LinkOption
.
NOFOLLOW_LINKS
);
if
(
Files
.
isSymbolicLink
(
path
))
{
if
(
Files
.
isSymbolicLink
(
path
))
{
linkType
=
FileLinkType
.
SYMLINK
;
linkType
=
FileLinkType
.
SYMLINK
;
}
else
if
(
Files
.
isDirectory
(
path
,
LinkOption
.
NOFOLLOW_LINKS
))
{
}
else
if
(
Files
.
isDirectory
(
path
,
LinkOption
.
NOFOLLOW_LINKS
))
{
...
@@ -785,7 +785,7 @@ public final class Posix
...
@@ -785,7 +785,7 @@ public final class Posix
}
}
short
permissions
=
getNumericAccessMode
(
Files
.
getPosixFilePermissions
(
path
));
short
permissions
=
getNumericAccessMode
(
Files
.
getPosixFilePermissions
(
path
));
Ba
si
c
FileAttributes
attrs
=
Files
.
readAttributes
(
path
,
Ba
si
c
FileAttributes
.
class
);
Po
si
x
FileAttributes
attrs
=
Files
.
readAttributes
(
path
,
Po
si
x
FileAttributes
.
class
);
FileLinkType
linkType
;
FileLinkType
linkType
;
if
(
attrs
.
isSymbolicLink
())
{
if
(
attrs
.
isSymbolicLink
())
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment