Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] fixed compiler error

This commit is contained in:
Robert von Burg 2015-10-16 17:59:20 +02:00
parent c37fd20efb
commit a22a6db408
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ch.eitchnet.utils

@ -1 +1 @@
Subproject commit 46c3db2913efaf4dd287c4feeb2548d85a6ac1d4 Subproject commit d0691e4d35220d94d29d642694749524b66fc66c

2
li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchComponent.java
View File

@ -219,7 +219,7 @@ public class StrolchComponent {
* *
* @throws PrivilegeException * @throws PrivilegeException
*/ */
protected <T> T runPrivileged(RunRunnable.Runnable<T> action) throws PrivilegeException { protected <T> T runPrivilegedRunnable(RunRunnable.Runnable<T> action) throws PrivilegeException {
return this.container.getPrivilegeHandler() return this.container.getPrivilegeHandler()
.runAsSystem(StrolchConstants.PRIVILEGED_SYSTEM_USER, new RunRunnable<>(action)).getResult(); .runAsSystem(StrolchConstants.PRIVILEGED_SYSTEM_USER, new RunRunnable<>(action)).getResult();
} }

4
li.strolch.rest/src/main/java/li/strolch/rest/DefaultStrolchSessionHandler.java
View File

@ -83,7 +83,7 @@ public class DefaultStrolchSessionHandler extends StrolchComponent implements St
this.certificateMap = Collections.synchronizedMap(new HashMap<>()); this.certificateMap = Collections.synchronizedMap(new HashMap<>());
if (this.reloadSessions) { if (this.reloadSessions) {
List<Certificate> certificates = runPrivileged(ctx -> { List<Certificate> certificates = runPrivilegedRunnable(ctx -> {
Certificate cert = ctx.getCertificate(); Certificate cert = ctx.getCertificate();
return this.privilegeHandler.getPrivilegeHandler(cert).getCertificates(cert).stream() return this.privilegeHandler.getPrivilegeHandler(cert).getCertificates(cert).stream()
.filter(c -> !c.getUserState().isSystem()).collect(Collectors.toList()); .filter(c -> !c.getUserState().isSystem()).collect(Collectors.toList());
@ -108,7 +108,7 @@ public class DefaultStrolchSessionHandler extends StrolchComponent implements St
public void stop() throws Exception { public void stop() throws Exception {
if (this.reloadSessions) { if (this.reloadSessions) {
runPrivileged(ctx -> getContainer().getPrivilegeHandler().getPrivilegeHandler(ctx.getCertificate()) runPrivilegedRunnable(ctx -> getContainer().getPrivilegeHandler().getPrivilegeHandler(ctx.getCertificate())
.persistSessions(ctx.getCertificate())); .persistSessions(ctx.getCertificate()));
} else if (this.certificateMap != null) { } else if (this.certificateMap != null) {