Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
minerva
core
Commits
1ea69afe
Commit
1ea69afe
authored
5 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
the user might be null
parent
486b27d9
No related branches found
No related tags found
1 merge request
!859
Resolve "deprecacy information for data overlay"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
service/src/main/java/lcsb/mapviewer/services/impl/FileService.java
+3
-2
3 additions, 2 deletions
...c/main/java/lcsb/mapviewer/services/impl/FileService.java
with
3 additions
and
2 deletions
service/src/main/java/lcsb/mapviewer/services/impl/FileService.java
+
3
−
2
View file @
1ea69afe
...
@@ -28,8 +28,9 @@ public class FileService implements IFileService {
...
@@ -28,8 +28,9 @@ public class FileService implements IFileService {
@Override
@Override
public
User
getOwnerByFileId
(
int
id
)
{
public
User
getOwnerByFileId
(
int
id
)
{
UploadedFileEntry
entry
=
uploadedFileEntryDao
.
getById
(
id
);
UploadedFileEntry
entry
=
uploadedFileEntryDao
.
getById
(
id
);
if
(
entry
!=
null
)
{
if
(
entry
!=
null
&&
entry
.
getOwner
()
!=
null
)
{
uploadedFileEntryDao
.
getById
(
id
).
getOwner
().
getLogin
();
//it's lazy initialized
entry
.
getOwner
().
getLogin
();
return
uploadedFileEntryDao
.
getById
(
id
).
getOwner
();
return
uploadedFileEntryDao
.
getById
(
id
).
getOwner
();
}
else
{
}
else
{
return
null
;
return
null
;
...
...
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