merge with branch issue-331

This commit is contained in:
Sebastian Sdorra
2013-02-16 17:12:10 +01:00
2 changed files with 3 additions and 3 deletions

View File

@@ -427,7 +427,7 @@
<jetty.version>7.6.8.v20121106</jetty.version> <jetty.version>7.6.8.v20121106</jetty.version>
<!-- security libraries --> <!-- security libraries -->
<shiro.version>1.2.1</shiro.version> <shiro.version>1.2.1-scm1</shiro.version>
<!-- repostitory libraries --> <!-- repostitory libraries -->
<jgit.version>2.2.0.201212191850-r</jgit.version> <jgit.version>2.2.0.201212191850-r</jgit.version>

View File

@@ -268,8 +268,8 @@ public class DefaultAdministrationContext implements AdministrationContext
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.debug("release runas for user {}", logger.debug("release runas for user {}/{}",
collection.getPrimaryPrincipal()); principal, collection.getPrimaryPrincipal());
} }
if (!subject.getPrincipal().equals(principal)) if (!subject.getPrincipal().equals(principal))