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

Merge pull request #2627 from mposolda/master

Browse source 
Migration and mongo fix
This commit is contained in:
Marek Posolda 2016-04-14 11:48:16 +02:00
commit 3275b528f9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
model/mongo/src/main/java/org/keycloak/connections/mongo/DefaultMongoConnectionFactoryProvider.java
View file

@ -180,7 +180,7 @@ public class DefaultMongoConnectionFactoryProvider implements MongoConnectionPro
private Class[] getManagedEntities() throws ClassNotFoundException { private Class[] getManagedEntities() throws ClassNotFoundException {
Class[] entityClasses = new Class[entities.length]; Class[] entityClasses = new Class[entities.length];
for (int i = 0; i < entities.length; i++) { for (int i = 0; i < entities.length; i++) {
entityClasses[i] = Thread.currentThread().getContextClassLoader().loadClass(entities[i]); entityClasses[i] = getClass().getClassLoader().loadClass(entities[i]);
} }
return entityClasses; return entityClasses;
} }

2
server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_2.java
View file

@ -34,7 +34,7 @@ public class MigrateTo1_9_2 {
if (realm.getBrowserSecurityHeaders() != null) { if (realm.getBrowserSecurityHeaders() != null) {
Map<String, String> browserSecurityHeaders = new HashMap<>(realm.getBrowserSecurityHeaders()); Map<String, String> browserSecurityHeaders = new HashMap<>(realm.getBrowserSecurityHeaders());
browserSecurityHeaders.put("xFrameOptions", "nosniff"); browserSecurityHeaders.put("xContentTypeOptions", "nosniff");
realm.setBrowserSecurityHeaders(Collections.unmodifiableMap(browserSecurityHeaders)); realm.setBrowserSecurityHeaders(Collections.unmodifiableMap(browserSecurityHeaders));
} }