Przeglądaj źródła

Merge pull request #799 from ShaneMcC/parserShutdown

Call parser shutdown whenever we are done with a parser.
pull/769/merge
Greg Holmes 7 lat temu
rodzic
commit
89160b8852
1 zmienionych plików z 10 dodań i 0 usunięć
  1. 10
    0
      src/main/java/com/dmdirc/Server.java

+ 10
- 0
src/main/java/com/dmdirc/Server.java Wyświetl plik

680
                 windowModel.getEventBus().unsubscribe(highlightManager);
680
                 windowModel.getEventBus().unsubscribe(highlightManager);
681
                 executorService.shutdown();
681
                 executorService.shutdown();
682
 
682
 
683
+                if (parser.isPresent()) {
684
+                    parser.get().shutdown();
685
+                }
686
+
683
                 disconnect();
687
                 disconnect();
684
 
688
 
685
                 myState.transition(ServerState.CLOSING);
689
                 myState.transition(ServerState.CLOSING);
770
             try {
774
             try {
771
                 parserLock.writeLock().lock();
775
                 parserLock.writeLock().lock();
772
                 oldParser = parser;
776
                 oldParser = parser;
777
+                if (oldParser.isPresent()) {
778
+                    oldParser.get().shutdown();
779
+                }
773
                 parser = Optional.empty();
780
                 parser = Optional.empty();
774
             } finally {
781
             } finally {
775
                 parserLock.writeLock().unlock();
782
                 parserLock.writeLock().unlock();
819
             try {
826
             try {
820
                 parserLock.writeLock().lock();
827
                 parserLock.writeLock().lock();
821
                 oldParser = parser;
828
                 oldParser = parser;
829
+                if (oldParser.isPresent()) {
830
+                    oldParser.get().shutdown();
831
+                }
822
                 parser = Optional.empty();
832
                 parser = Optional.empty();
823
             } finally {
833
             } finally {
824
                 parserLock.writeLock().unlock();
834
                 parserLock.writeLock().unlock();

Ładowanie…
Anuluj
Zapisz