You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2011/03/05 23:28:25 UTC
svn commit: r1078377 -
/shiro/trunk/core/src/test/java/org/apache/shiro/mgt/VMSingletonDefaultSecurityManagerTest.java
Author: lhazlewood
Date: Sat Mar 5 22:28:25 2011
New Revision: 1078377
URL: http://svn.apache.org/viewvc?rev=1078377&view=rev
Log:
SHIRO-270: fix implemented
Modified:
shiro/trunk/core/src/test/java/org/apache/shiro/mgt/VMSingletonDefaultSecurityManagerTest.java
Modified: shiro/trunk/core/src/test/java/org/apache/shiro/mgt/VMSingletonDefaultSecurityManagerTest.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/java/org/apache/shiro/mgt/VMSingletonDefaultSecurityManagerTest.java?rev=1078377&r1=1078376&r2=1078377&view=diff
==============================================================================
--- shiro/trunk/core/src/test/java/org/apache/shiro/mgt/VMSingletonDefaultSecurityManagerTest.java (original)
+++ shiro/trunk/core/src/test/java/org/apache/shiro/mgt/VMSingletonDefaultSecurityManagerTest.java Sat Mar 5 22:28:25 2011
@@ -56,18 +56,21 @@ public class VMSingletonDefaultSecurityM
sm.setRealm(new IniRealm(ini));
SecurityUtils.setSecurityManager(sm);
- Subject subject = SecurityUtils.getSubject();
+ try {
+ Subject subject = SecurityUtils.getSubject();
- AuthenticationToken token = new UsernamePasswordToken("guest", "guest");
- subject.login(token);
- subject.getSession().setAttribute("key", "value");
- assertTrue(subject.getSession().getAttribute("key").equals("value"));
+ AuthenticationToken token = new UsernamePasswordToken("guest", "guest");
+ subject.login(token);
+ subject.getSession().setAttribute("key", "value");
+ assertTrue(subject.getSession().getAttribute("key").equals("value"));
- subject = SecurityUtils.getSubject();
+ subject = SecurityUtils.getSubject();
- assertTrue(subject.isAuthenticated());
- assertTrue(subject.getSession().getAttribute("key").equals("value"));
-
- sm.destroy();
+ assertTrue(subject.isAuthenticated());
+ assertTrue(subject.getSession().getAttribute("key").equals("value"));
+ } finally {
+ sm.destroy();
+ SecurityUtils.setSecurityManager(null);
+ }
}
}