You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/09/30 18:53:56 UTC
svn commit: r1003154 -
/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatSecurityService.java
Author: dblevins
Date: Thu Sep 30 16:53:56 2010
New Revision: 1003154
URL: http://svn.apache.org/viewvc?rev=1003154&view=rev
Log:
Fixes a failure in the itests on OpenEJB/Tomcat. Method signature of the override had changed in the parent.
Modified:
openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatSecurityService.java
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatSecurityService.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatSecurityService.java?rev=1003154&r1=1003153&r2=1003154&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatSecurityService.java (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatSecurityService.java Thu Sep 30 16:53:56 2010
@@ -22,6 +22,7 @@ import org.apache.catalina.Service;
import org.apache.catalina.Engine;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Server;
+import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.core.security.AbstractSecurityService;
import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.spi.CallerPrincipal;
@@ -128,7 +129,7 @@ public class TomcatSecurityService exte
}
}
- protected Subject getRunAsSubject(CoreDeploymentInfo callingDeploymentInfo) {
+ protected Subject getRunAsSubject(DeploymentInfo callingDeploymentInfo) {
Subject runAsSubject = super.getRunAsSubject(callingDeploymentInfo);
if (runAsSubject != null) return runAsSubject;