You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by gl...@apache.org on 2001/03/31 17:21:55 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardServer.java
glenn 01/03/31 07:21:55
Modified: catalina/src/share/org/apache/catalina/core
StandardServer.java
Log:
Ensure socket ignores and logs SocketPermission AccessControlException's
Revision Changes Path
1.4 +8 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StandardServer.java 2001/02/07 01:08:58 1.3
+++ StandardServer.java 2001/03/31 15:21:55 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v 1.3 2001/02/07 01:08:58 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/02/07 01:08:58 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v 1.4 2001/03/31 15:21:55 glenn Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/03/31 15:21:55 $
*
* ====================================================================
*
@@ -70,6 +70,7 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import java.security.AccessControlException;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
@@ -86,7 +87,7 @@
* (but not required) when deploying and starting Catalina.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/02/07 01:08:58 $
+ * @version $Revision: 1.4 $ $Date: 2001/03/31 15:21:55 $
*/
public final class StandardServer
@@ -251,6 +252,9 @@
socket = serverSocket.accept();
socket.setSoTimeout(10 * 1000); // Ten seconds
stream = socket.getInputStream();
+ } catch (AccessControlException ace) {
+ log("socket accept security exception: " + ace.getMessage());
+ continue;
} catch (IOException e) {
System.err.println("StandardServer.await: accept: " + e);
e.printStackTrace();