[jboss-cvs] JBossAS SVN: r98920 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/security.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2009-12-23 12:03:31 -0500 (Wed, 23 Dec 2009)
New Revision: 98920

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/RemoteHostValve.java
Log:
JBAS-7542: updated security libraries

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/RemoteHostValve.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/RemoteHostValve.java	2009-12-23 16:05:04 UTC (rev 98919)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/RemoteHostValve.java	2009-12-23 17:03:31 UTC (rev 98920)
@@ -21,48 +21,38 @@
  */
 package org.jboss.web.tomcat.security;
 
-import java.lang.reflect.Method;
 import java.io.IOException;
+
 import javax.servlet.ServletException;
 
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.valves.ValveBase;
 import org.jboss.logging.Logger;
-//import org.jboss.security.HostThreadLocal;
+import org.jboss.security.plugins.HostThreadLocal; 
 
 /** 
  This valve gets the remote host and sticks it in a thread local.  It is 
  to be used with RemoteHostTrustLoginModule in particular
-   
+
  @author Andrew C. Oliver (acoliver at gmail.com)
  @version $Revision: 0 $
  */
-public class RemoteHostValve
-   extends ValveBase
+public class RemoteHostValve extends ValveBase
 {
-   private static Logger log = Logger.getLogger(RemoteHostValve.class);
-   private static boolean trace = log.isTraceEnabled();
+	private static Logger log = Logger.getLogger(RemoteHostValve.class);
+	private boolean trace = log.isTraceEnabled();
 
-   public void invoke(Request request, Response response)
-      throws IOException, ServletException
-   {
-      boolean trace = log.isTraceEnabled();
-      if(trace) {
-        log.trace("in RemoteHostValve");
-      }
-      String remoteHost = request.getRemoteHost();
-      if(trace) {
-        log.trace("remoteHostValve set remoteHost to be "+remoteHost);
-      } 
-      try {
-         Class clazz = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.security.HostThreadLocal");
-         Method m = clazz.getMethod("set",new Class[] {String.class});
-         m.invoke(null,new Object[]{remoteHost});
-      } catch (Exception e) {
-         throw new RuntimeException("Error providing the remoteHost to HostThreadLocal, most likely this is a version mismatch",e);
-      }
-      //HostThreadLocal.set(remoteHost);
-      getNext().invoke(request, response);
-   }
-}
+	public void invoke(Request request, Response response)
+	throws IOException, ServletException
+	{ 
+		String remoteHost = request.getRemoteHost();
+		if(trace) 
+		{
+			log.trace("RemoteHostValve set remoteHost to be "+remoteHost);
+		} 
+		
+		HostThreadLocal.set(remoteHost);
+		getNext().invoke(request, response);
+	}
+}
\ No newline at end of file