From 09dacb6481b06f78f271fa6c9486698d52a33409 Mon Sep 17 00:00:00 2001
From: malenkov <unknown>
Date: Mon, 22 Jul 2013 15:36:30 +0400
Subject: [PATCH] 8019975:
 closed/javax/swing/JFileChooser/4966171/bug4966171.java throws
 java.io.NotSerializableException:
 javax.swing.plaf.basic.BasicFileChooserUI$AcceptAllFileFilter Reviewed-by:
 alexsch

---
 src/share/classes/javax/swing/JFileChooser.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/share/classes/javax/swing/JFileChooser.java b/src/share/classes/javax/swing/JFileChooser.java
index d30c69675..e053b7af0 100644
--- a/src/share/classes/javax/swing/JFileChooser.java
+++ b/src/share/classes/javax/swing/JFileChooser.java
@@ -1149,9 +1149,10 @@ public class JFileChooser extends JComponent implements Accessible {
         int index = filters.indexOf(f);
         if (index >= 0) {
             if(getFileFilter() == f) {
-                if (isAcceptAllFileFilterUsed()) {
+                FileFilter aaff = getAcceptAllFileFilter();
+                if (isAcceptAllFileFilterUsed() && (aaff != f)) {
                     // choose default filter if it is used
-                    setFileFilter(getAcceptAllFileFilter());
+                    setFileFilter(aaff);
                 }
                 else if (index > 0) {
                     // choose the first filter, because it is not removed
-- 
GitLab