You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/07/26 16:53:19 UTC

[tomcat] branch 8.5.x updated: Fix back-port

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 8734e75  Fix back-port
8734e75 is described below

commit 8734e756497497f4e9cf4a402d0ee0bf91f4daeb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 26 17:53:10 2021 +0100

    Fix back-port
---
 java/org/apache/catalina/filters/CorsFilter.java | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/java/org/apache/catalina/filters/CorsFilter.java b/java/org/apache/catalina/filters/CorsFilter.java
index 60911af..33130f1 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -911,17 +911,6 @@ public class CorsFilter implements Filter {
     }
 
 
-    /*
-     * Log objects are not Serializable but this Filter is because it extends
-     * GenericFilter. Tomcat won't serialize a Filter but in case something else
-     * does...
-     */
-    private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
-        ois.defaultReadObject();
-        log = LogFactory.getLog(CorsFilter.class);
-    }
-
-
     // -------------------------------------------------- CORS Response Headers
 
     /**

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org