View | Details | Raw Unified | Return to bug 58534
Collapse All | Expand All

(-)java/org/apache/tomcat/util/net/AprEndpoint.java (-7 / +4 lines)
Lines 1483-1489 Link Here
1483
            info = addList.get();
1483
            info = addList.get();
1484
            while (info != null) {
1484
            while (info != null) {
1485
                boolean comet = connections.get(Long.valueOf(info.socket)).isComet();
1485
                boolean comet = connections.get(Long.valueOf(info.socket)).isComet();
1486
                if (!comet || (comet && !processSocket(info.socket, SocketStatus.STOP))) {
1486
                if (!comet || !processSocket(info.socket, SocketStatus.STOP)) {
1487
                    // Make sure the  socket isn't in the poller before we close it
1487
                    // Make sure the  socket isn't in the poller before we close it
1488
                    removeFromPoller(info.socket);
1488
                    removeFromPoller(info.socket);
1489
                    // Poller isn't running at this point so use destroySocket()
1489
                    // Poller isn't running at this point so use destroySocket()
Lines 1500-1507 Link Here
1500
                    for (int n = 0; n < rv; n++) {
1500
                    for (int n = 0; n < rv; n++) {
1501
                        boolean comet = connections.get(
1501
                        boolean comet = connections.get(
1502
                                Long.valueOf(desc[n*2+1])).isComet();
1502
                                Long.valueOf(desc[n*2+1])).isComet();
1503
                        if (!comet || (comet && !processSocket(
1503
                        if (!comet || !processSocket(desc[n*2+1], SocketStatus.STOP)) {
1504
                                desc[n*2+1], SocketStatus.STOP))) {
1505
                            destroySocket(desc[n*2+1]);
1504
                            destroySocket(desc[n*2+1]);
1506
                        }
1505
                        }
1507
                    }
1506
                    }
Lines 1630-1637 Link Here
1630
                removeFromPoller(socket);
1629
                removeFromPoller(socket);
1631
                boolean comet = connections.get(
1630
                boolean comet = connections.get(
1632
                        Long.valueOf(socket)).isComet();
1631
                        Long.valueOf(socket)).isComet();
1633
                if (!comet || (comet && !processSocket(
1632
                if (!comet || !processSocket(socket, SocketStatus.TIMEOUT)) {
1634
                        socket, SocketStatus.TIMEOUT))) {
1635
                    destroySocket(socket);
1633
                    destroySocket(socket);
1636
                    addList.remove(socket);
1634
                    addList.remove(socket);
1637
                    closeList.remove(socket);
1635
                    closeList.remove(socket);
Lines 1779-1786 Link Here
1779
                                if (!addToPoller(info.socket, wrapper.pollerFlags)) {
1777
                                if (!addToPoller(info.socket, wrapper.pollerFlags)) {
1780
                                    // Can't do anything: close the socket right
1778
                                    // Can't do anything: close the socket right
1781
                                    // away
1779
                                    // away
1782
                                    if (!comet || (comet && !processSocket(
1780
                                    if (!comet || !processSocket(info.socket, SocketStatus.ERROR)) {
1783
                                            info.socket, SocketStatus.ERROR))) {
1784
                                        closeSocket(info.socket);
1781
                                        closeSocket(info.socket);
1785
                                    }
1782
                                    }
1786
                                } else {
1783
                                } else {

Return to bug 58534