Author: djencks
Date: Wed Jun 4 23:52:23 2008
New Revision: 663477
URL: http://svn.apache.org/viewvc?rev=663477&view=rev
Log:
GERONIMO-4099 don't wipe out run-as info, merge from trunk
Modified:
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java?rev=663477&r1=663476&r2=663477&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
(original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
Wed Jun 4 23:52:23 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 {
|