Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
6ae4581c
Commit
6ae4581c
authored
Nov 28, 2014
by
Matija Obreza
Browse files
Handle AccessionDetails#from NPE
parent
4cbfcae0
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/genesys2/server/model/elastic/AccessionDetails.java
View file @
6ae4581c
...
...
@@ -409,10 +409,10 @@ public class AccessionDetails {
for
(
Organization
org
:
organizations
)
{
networks
.
add
(
org
.
getSlug
());
}
if
(
institute
==
null
)
institute
=
new
Institute
();
institute
.
setNetworks
(
networks
);
}
}
src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java
View file @
6ae4581c
...
...
@@ -315,6 +315,8 @@ public class GenesysServiceImpl implements GenesysService, DatasetService {
@Override
public
AccessionDetails
getAccessionDetails
(
long
accessionId
)
{
Accession
accession
=
getAccession
(
accessionId
);
if
(
accession
==
null
)
return
null
;
AccessionDetails
ad
=
AccessionDetails
.
from
(
accession
);
ad
.
networks
(
organizationRepository
.
getOrganizations
(
accession
.
getInstitute
()));
...
...
@@ -335,6 +337,9 @@ public class GenesysServiceImpl implements GenesysService, DatasetService {
public
Set
<
AccessionDetails
>
getAccessionDetails
(
Collection
<
Accession
>
accessions
)
{
Set
<
AccessionDetails
>
set
=
new
HashSet
<
AccessionDetails
>(
accessions
.
size
());
for
(
Accession
accn
:
accessions
)
{
if
(
accn
==
null
)
continue
;
set
.
add
(
getAccessionDetails
(
accn
.
getId
()));
}
return
set
;
...
...
src/main/java/org/genesys2/server/service/worker/ElasticUpdaterAspect.java
View file @
6ae4581c
...
...
@@ -161,6 +161,9 @@ public class ElasticUpdaterAspect {
// Delete all
for
(
AccessionDetails
accn
:
deletedAccessions
)
{
if
(
accn
==
null
)
continue
;
elasticUpdater
.
remove
(
Accession
.
class
,
accn
.
getId
());
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment