Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simply return empty string if middlename is null #84

Merged
merged 1 commit into from
Dec 14, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/main/java/omero/gateway/model/ExperimenterData.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*------------------------------------------------------------------------------
* Copyright (C) 2006-2017 University of Dundee. All rights reserved.
* Copyright (C) 2006-2023 University of Dundee. All rights reserved.
*
*
* This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -268,10 +268,7 @@ public GroupData getDefaultGroup() {
*/
public String getMiddleName() {
omero.RString n = asExperimenter().getMiddleName();
if (n == null || n.getValue() == null) {
throw new IllegalStateException(
"The name should never have been null");
}
if (n == null || n.getValue() == null) return "";
return n.getValue();
}

Expand Down