From 03ae316b62f1ee9d00e283e5fa2c758466c20dbb Mon Sep 17 00:00:00 2001 From: serega6531 Date: Fri, 19 Jun 2020 15:01:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/ru/serega6531/packmate/pcap/FilePcapWorker.java | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index a46afa4..1a5294a 100644 --- a/build.gradle +++ b/build.gradle @@ -31,11 +31,11 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-websocket" implementation 'org.springframework.session:spring-session-core' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' - compile group: 'commons-io', name: 'commons-io', version: '2.6' + compile group: 'commons-io', name: 'commons-io', version: '2.7' compile 'org.pcap4j:pcap4j-core:1.8.2' compile 'org.pcap4j:pcap4j-packetfactory-static:1.8.2' compile group: 'com.google.guava', name: 'guava', version: '28.2-jre' - compile group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.5.0-SNAPSHOT' + compile group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.5.1' compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.65' compile group: 'org.bouncycastle', name: 'bctls-jdk15on', version: '1.65' compileOnly 'org.projectlombok:lombok' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b4429..622ab64 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/ru/serega6531/packmate/pcap/FilePcapWorker.java b/src/main/java/ru/serega6531/packmate/pcap/FilePcapWorker.java index d11836c..730d552 100644 --- a/src/main/java/ru/serega6531/packmate/pcap/FilePcapWorker.java +++ b/src/main/java/ru/serega6531/packmate/pcap/FilePcapWorker.java @@ -32,7 +32,7 @@ public class FilePcapWorker extends AbstractPcapWorker { this.subscriptionService = subscriptionService; file = new File(filename); - if(!file.exists()) { + if (!file.exists()) { throw new IllegalArgumentException("File " + file.getAbsolutePath() + " does not exist"); } @@ -61,10 +61,8 @@ public class FilePcapWorker extends AbstractPcapWorker { //noinspection BusyWait Thread.sleep(100); // чтобы ошибки не летели слишком быстро } catch (EOFException e) { - stop(); - log.info("All packets processed"); - break; + stop(); } } }