libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

KEYCLOAK-7608 Check if themes dir is null in FolderThemeProvider

Browse source
This commit is contained in:
stianst 2018-09-05 06:56:29 +02:00 committed by Stian Thorgersen
parent 812e76c39b
commit c56e171f3a
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/src/main/java/org/keycloak/theme/FolderThemeProvider.java
View file

@ -42,12 +42,20 @@ public class FolderThemeProvider implements ThemeProvider {
@Override
public Theme getTheme(String name, Theme.Type type) throws IOException {
if (themesDir == null) {
return null;
}
File themeDir = getThemeDir(name, type);
return themeDir.isDirectory() ? new FolderTheme(themeDir, name, type) : null;
}
@Override
public Set<String> nameSet(Theme.Type type) {
if (themesDir == null) {
return Collections.emptySet();
}
final String typeName = type.name().toLowerCase();
File[] themeDirs = themesDir.listFiles(new FileFilter() {
@Override
@ -68,7 +76,7 @@ public class FolderThemeProvider implements ThemeProvider {
@Override
public boolean hasTheme(String name, Theme.Type type) {
return getThemeDir(name, type).isDirectory();
return themesDir != null ? getThemeDir(name, type).isDirectory() : false;
}
@Override

1
services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java
View file

@ -59,4 +59,5 @@ public class FolderThemeProviderFactory implements ThemeProviderFactory {
public String getId() {
return "folder";
}
}