From 48397aed0988e7d110d2b9e381a45a898963cbbd Mon Sep 17 00:00:00 2001
From: serega6531 <shk@nextbi.ru>
Date: Sun, 12 May 2019 03:51:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20sockjs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/serega6531/packmate/service/PatternService.java | 10 ++++++++--
 .../packmate/service/StreamSubscriptionService.java    |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/serega6531/packmate/service/PatternService.java b/src/main/java/ru/serega6531/packmate/service/PatternService.java
index 1488555..ef3cf3a 100644
--- a/src/main/java/ru/serega6531/packmate/service/PatternService.java
+++ b/src/main/java/ru/serega6531/packmate/service/PatternService.java
@@ -10,6 +10,7 @@ import ru.serega6531.packmate.repository.PatternRepository;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -47,7 +48,12 @@ public class PatternService {
     }
 
     public void deleteById(int id) {
-        repository.deleteById(id);
+        final Optional<Pattern> optional = repository.findById(id);
+        if(optional.isPresent()) {
+            final Pattern pattern = optional.get();
+            log.info("Удален паттерн {} со значением {}", pattern.getName(), pattern.getValue());
+            repository.delete(pattern);
+        }
     }
 
     public Pattern save(Pattern pattern) {
@@ -55,7 +61,7 @@ public class PatternService {
         return repository.save(pattern);
     }
 
-    public java.util.regex.Pattern compilePattern(Pattern pattern) {
+    private java.util.regex.Pattern compilePattern(Pattern pattern) {
         return compiledPatterns.computeIfAbsent(pattern.getValue(), java.util.regex.Pattern::compile);
     }
 
diff --git a/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java b/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java
index 16ca820..320d0ff 100644
--- a/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java
+++ b/src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java
@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.sockjs.SockJsTransportFailureException;
 import ru.serega6531.packmate.model.Stream;
 
 import java.io.IOException;
@@ -40,7 +41,7 @@ public class StreamSubscriptionService {
         subscribers.forEach(s -> {
             try {
                 s.sendMessage(objectToTextMessage(stream));
-            } catch (IOException e) {
+            } catch (IOException | SockJsTransportFailureException e) {
                 e.printStackTrace();
             }
         });