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
8b546ef9
Commit
8b546ef9
authored
13 years ago
by
kohleman
Browse files
Options
Downloads
Patches
Plain Diff
fix: handle empty field
SVN: 23444
parent
9d893948
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java
+16
-10
16 additions, 10 deletions
...a/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java
with
16 additions
and
10 deletions
deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java
+
16
−
10
View file @
8b546ef9
...
...
@@ -34,6 +34,7 @@ import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import
ch.systemsx.cisd.common.logging.LogInitializer
;
import
ch.systemsx.cisd.common.mail.EMailAddress
;
import
ch.systemsx.cisd.common.mail.IMailClient
;
import
ch.systemsx.cisd.common.shared.basic.utils.StringUtils
;
import
ch.systemsx.cisd.common.spring.HttpInvokerUtils
;
import
ch.systemsx.cisd.common.utilities.PropertyUtils
;
import
ch.systemsx.cisd.openbis.generic.shared.ITrackingServer
;
...
...
@@ -132,12 +133,6 @@ public class TrackingClient
private
static
EnvironmentFailureException
createAuthentificationException
(
Parameters
params
,
Exception
exOrNull
)
{
List
<
EMailAddress
>
adminEmails
=
new
ArrayList
<
EMailAddress
>();
for
(
String
adminEmail
:
params
.
getAdminEmail
().
split
(
","
))
{
adminEmails
.
add
(
new
EMailAddress
(
adminEmail
.
trim
()));
}
String
exceptionMsg
=
(
exOrNull
==
null
)
?
""
:
" Unexpected exception has occured: "
+
exOrNull
.
getMessage
();
...
...
@@ -146,10 +141,21 @@ public class TrackingClient
LogUtils
.
environmentError
(
"Cannot authentificate in openBIS as a user '%s'. Check that the password is correct and that openBIS service URL is correct.%s"
,
params
.
getOpenbisUser
(),
exceptionMsg
);
IMailClient
emailClient
=
params
.
getMailClient
();
emailClient
.
sendEmailMessage
(
"[] DSU Tracking client NOT working"
,
ret
.
getLocalizedMessage
(),
null
,
new
EMailAddress
(
params
.
getNotificationEmail
()),
(
EMailAddress
[])
adminEmails
.
toArray
());
if
(
false
==
StringUtils
.
isBlank
(
params
.
getAdminEmail
()))
{
List
<
EMailAddress
>
adminEmails
=
new
ArrayList
<
EMailAddress
>();
for
(
String
adminEmail
:
params
.
getAdminEmail
().
split
(
","
))
{
adminEmails
.
add
(
new
EMailAddress
(
adminEmail
.
trim
()));
}
IMailClient
emailClient
=
params
.
getMailClient
();
emailClient
.
sendEmailMessage
(
"[DSU Tracker] DSU Tracking client NOT working"
,
ret
.
getLocalizedMessage
(),
null
,
new
EMailAddress
(
params
.
getNotificationEmail
()),
adminEmails
.
toArray
(
new
EMailAddress
[
0
]));
}
return
ret
;
}
}
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