Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
12
Issues
12
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
d7d2952e
Commit
d7d2952e
authored
Nov 13, 2015
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed missing NPE check and println to stderr
parent
454a710a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
src/main/java/org/genesys2/server/service/impl/GeoRegionServiceImpl.java
...rg/genesys2/server/service/impl/GeoRegionServiceImpl.java
+6
-1
src/main/java/org/genesys2/server/servlet/controller/SelectionController.java
...nesys2/server/servlet/controller/SelectionController.java
+3
-3
No files found.
src/main/java/org/genesys2/server/service/impl/GeoRegionServiceImpl.java
View file @
d7d2952e
...
...
@@ -56,8 +56,13 @@ public class GeoRegionServiceImpl implements GeoRegionService {
@Override
public
GeoRegion
getRegion
(
Country
country
)
{
// NPE check
country
.
getId
();
GeoRegion
geoRegion
=
geoRegionRepository
.
findByCountry
(
country
);
geoRegion
.
getCountries
().
size
();
if
(
geoRegion
!=
null
)
{
geoRegion
.
getCountries
().
size
();
}
return
geoRegion
;
}
...
...
src/main/java/org/genesys2/server/servlet/controller/SelectionController.java
View file @
d7d2952e
...
...
@@ -147,14 +147,14 @@ public class SelectionController extends BaseController {
final
String
[]
splits
=
accessionIds
.
split
(
"[,;\\t\\n]+"
);
for
(
final
String
s
:
splits
)
{
System
.
err
.
println
(
">> '"
+
s
.
trim
()
+
"'"
);
//
System.err.println(">> '" + s.trim() + "'");
try
{
final
Accession
accession
=
genesysService
.
getAccession
(
instCode
,
s
.
trim
());
if
(
accession
!=
null
)
{
System
.
err
.
println
(
"\t"
+
accession
.
getId
());
//
System.err.println("\t" + accession.getId());
selectionBean
.
add
(
accession
.
getId
());
}
else
{
System
.
err
.
println
(
"\t NF='"
+
s
+
"'"
);
//
System.err.println("\t NF='" + s + "'");
}
}
catch
(
NonUniqueAccessionException
e
)
{
// Non-unique
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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