/*
 *  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.tomcat.websocket.server;

import java.net.URI;

import javax.servlet.ServletContextEvent;
import javax.websocket.ClientEndpoint;
import javax.websocket.CloseReason;
import javax.websocket.ContainerProvider;
import javax.websocket.DeploymentException;
import javax.websocket.OnClose;
import javax.websocket.OnError;
import javax.websocket.OnMessage;
import javax.websocket.OnOpen;
import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
import javax.websocket.server.ServerContainer;
import javax.websocket.server.ServerEndpointConfig;

import org.junit.Test;

import org.apache.catalina.Context;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.tomcat.websocket.WebSocketBaseTest;

public class TestCloseBug58624 extends WebSocketBaseTest {

    @Test
    public void testOnErrorNotCalledWhenClosingConnection() throws Throwable {
        Tomcat tomcat = getTomcatInstance();
        // No file system docBase required
        Context ctx = tomcat.addContext("", null);
        ctx.addApplicationListener(Bug58624ServerConfig.class.getName());
        Tomcat.addServlet(ctx, "default", new DefaultServlet());
        ctx.addServletMapping("/", "default");

        WebSocketContainer wsContainer = ContainerProvider.getWebSocketContainer();

        tomcat.start();

        Bug58624ClientEndpoint client = new Bug58624ClientEndpoint();
        URI uri = new URI("ws://localhost:" + getPort() + Bug58624ServerConfig.PATH);

        Session session = wsContainer.connectToServer(client, uri);
        session.close();

        if (client.getError() != null) {
            throw client.getError();
        }
    }

    @ClientEndpoint
    public class Bug58624ClientEndpoint {

        private volatile Throwable t;


        @OnError
        public void onError(Throwable t) {
            this.t = t;
        }


        public Throwable getError() {
            return this.t;
        }
    }

    public static class Bug58624ServerConfig extends WsContextListener {

        public static String PATH = "/bug58624";


        @Override
        public void contextInitialized(ServletContextEvent sce) {
            super.contextInitialized(sce);

            ServerContainer sc = (ServerContainer) sce.getServletContext().getAttribute(
                    Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);

            ServerEndpointConfig sec = ServerEndpointConfig.Builder.create(
                    Bug58624ServerEndpoint.class, PATH).build();

            try {
                sc.addEndpoint(sec);
            } catch (DeploymentException e) {
                throw new RuntimeException(e);
            }
        }
    }

    public static class Bug58624ServerEndpoint {

        @OnOpen
        public void onOpen() {
            System.out.println("Session opened");
        }


        @OnMessage
        public void onMessage(@SuppressWarnings("unused") Session session, String message) {
            System.out.println("Received message " + message);
        }


        @OnError
        public void onError(Throwable t) {
            System.out.println("HERE");
            t.printStackTrace();
        }


        @OnClose
        public void onClose(CloseReason cr) {
            System.out.println("Session closed: " + cr);
        }
    }
}

@@ -872,16 +872,66 @@
 net.URI;
+%0Aimport java.util.concurrent.atomic.AtomicInteger;
 %0A%0Aimport
@@ -1431,16 +1431,41 @@
 onfig;%0A%0A
+import org.junit.Assert;%0A
 import o
@@ -2498,24 +2498,451 @@
 n.close();%0A%0A
+        // Wait for session to close on the server%0A        int count = 0;%0A        while (count %3C 50 && Bug58624ServerEndpoint.getOpenSessionCount() %3E 0) %7B%0A            count++;%0A            Thread.sleep(100);%0A        %7D%0A        Assert.assertEquals(0,  Bug58624ServerEndpoint.getOpenSessionCount());%0A%0A        // Ensure no errors were reported on the server%0A        Assert.assertEquals(0,  Bug58624ServerEndpoint.getErrorCount());%0A%0A
         if (
@@ -4106,94 +4106,439 @@
     
-@OnOpen%0A        public void onOpen() %7B%0A            System.out.println(%22Session opened%22
+private static AtomicInteger openSessionCount = new AtomicInteger(0);%0A        private static AtomicInteger errorCount = new AtomicInteger(0);%0A%0A        public static int getOpenSessionCount() %7B%0A            return openSessionCount.get();%0A        %7D%0A%0A        public static int getErrorCount() %7B%0A            return errorCount.get();%0A        %7D%0A%0A        @OnOpen%0A        public void onOpen() %7B%0A            openSessionCount.incrementAndGet(
 );%0A 
@@ -4811,33 +4811,35 @@
     
-System.
+errorC
 ou
+n
 t.
-println(%22HERE%22
+incrementAndGet(
 );%0A 
@@ -4927,16 +4927,44 @@
 onClose(
+@SuppressWarnings(%22unused%22) 
 CloseRea
@@ -4989,50 +4989,41 @@
     
-System.out.println(%22Session closed: %22 + cr
+openSessionCount.decrementAndGet(
 );%0A 

Add a wait for the session to close on the server. Some failures were observed on Gump when this hadn't happened by the time the test ended. Add a check that no errors occurred on the server.