You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/06/05 09:08:20 UTC
svn commit: r663484 -
/geronimo/server/branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
Author: djencks
Date: Thu Jun 5 00:08:19 2008
New Revision: 663484
URL: http://svn.apache.org/viewvc?rev=663484&view=rev
Log:
GERONIMO-4099 don't wipe out run-as info, merge from trunk
Modified:
geronimo/server/branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
Modified: geronimo/server/branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java?rev=663484&r1=663483&r2=663484&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java Thu Jun 5 00:08:19 2008
@@ -216,10 +216,6 @@
*/
public boolean hasRole(Principal principal, String role) {
- if ((principal == null) || (role == null) || !(principal instanceof JAASTomcatPrincipal)) {
- return false;
- }
-
String name = currentRequestWrapperName.get();
/**
@@ -229,10 +225,6 @@
name = "";
}
- //Set the caller
- Subject currentCaller = ((JAASTomcatPrincipal) principal).getSubject();
- ContextManager.setCallers(currentCaller, currentCaller);
-
AccessControlContext acc = ContextManager.getCurrentContext();
try {