/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.commons.net.util;

import java.io.IOException;
import java.io.Serializable;
import java.util.EventListener;
import java.util.Iterator;
import java.util.concurrent.CopyOnWriteArrayList;

/**
 */

public class ListenerList implements Serializable, Iterable<EventListener>
{
    private static final long serialVersionUID = -1934227607974228213L;

    private final CopyOnWriteArrayList<EventListener> listeners;

    public ListenerList()
    {
        listeners = new CopyOnWriteArrayList<>();
    }

    public void addListener(final EventListener listener)
    {
            listeners.add(listener);
    }

    public int getListenerCount()
    {
        return listeners.size();
    }

    /**
     * Return an {@link Iterator} for the {@link EventListener} instances.
     *
     * @return an {@link Iterator} for the {@link EventListener} instances
     * @since 2.0
     * TODO Check that this is a good defensive strategy
     */
    @Override
    public Iterator<EventListener> iterator() {
            return listeners.iterator();
    }

    public  void removeListener(final EventListener listener)
    {
            listeners.remove(listener);
    }

    /*
        Serialization is unnecessary for this class.
        Reject attempts to do so until such time as the Serializable attribute can be dropped.
     */

    private void writeObject(java.io.ObjectOutputStream out) throws IOException
    {
        throw new UnsupportedOperationException("Serialization is not supported");
    }
    
    private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException
    {
        throw new UnsupportedOperationException("Serialization is not supported");
    }
 
}

@@ -863,16 +863,85 @@
 eption;%0A
+import java.io.ObjectInputStream;%0Aimport java.io.ObjectOutputStream;%0A
 import j
@@ -2235,32 +2235,24 @@
 writeObject(
-java.io.
 ObjectOutput
@@ -2410,24 +2410,16 @@
 dObject(
-java.io.
 ObjectIn

Use import instead of FQCNs.