Skip to content

Commit c56aae3

Browse files
authored
Merge pull request #3347 from katysaintin/master
Fix an error in databrowser when preference org.csstudio.trends.databrowser3/archives is empty
2 parents 6ad3f81 + 2f39aa0 commit c56aae3

File tree

1 file changed

+9
-7
lines changed
  • app/databrowser/src/main/java/org/csstudio/trends/databrowser3/preferences

1 file changed

+9
-7
lines changed

app/databrowser/src/main/java/org/csstudio/trends/databrowser3/preferences/Preferences.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,15 @@ private static void update(final String setting, final boolean value)
164164
public static List<ArchiveDataSource> parseArchives(final String setting)
165165
{
166166
final List<ArchiveDataSource> urls = new ArrayList<>();
167-
for (String fragment : setting.split("\\*"))
168-
{
169-
final String[] strs = fragment.split("\\|");
170-
if (strs.length == 1)
171-
urls.add(new ArchiveDataSource(strs[0], strs[0]));
172-
else if (strs.length >= 2)
173-
urls.add(new ArchiveDataSource(strs[0], strs[1]));
167+
//When settings is empty do not search for a archive datasource
168+
if (setting != null && !setting.trim().isEmpty()) {
169+
for (String fragment : setting.split("\\*")) {
170+
final String[] strs = fragment.split("\\|");
171+
if (strs.length == 1)
172+
urls.add(new ArchiveDataSource(strs[0], strs[0]));
173+
else if (strs.length >= 2)
174+
urls.add(new ArchiveDataSource(strs[0], strs[1]));
175+
}
174176
}
175177
return urls;
176178
}

0 commit comments

Comments
 (0)