diff --git a/grpcmock-spring-boot/src/main/java/org/grpcmock/springboot/GrpcMockConfiguration.java b/grpcmock-spring-boot/src/main/java/org/grpcmock/springboot/GrpcMockConfiguration.java index cc3e758..9adb550 100644 --- a/grpcmock-spring-boot/src/main/java/org/grpcmock/springboot/GrpcMockConfiguration.java +++ b/grpcmock-spring-boot/src/main/java/org/grpcmock/springboot/GrpcMockConfiguration.java @@ -91,13 +91,15 @@ public void afterPropertiesSet() { @Override public void start() { - this.server.start(); - updateGlobalServer(); + if (this.server != null) { + this.server.start(); + updateGlobalServer(); + } } @Override public void stop() { - if (isRunning()) { + if (isRunning() && this.server != null) { this.server.stop(); this.server = null; this.running = false; @@ -113,7 +115,9 @@ public boolean isRunning() { } public void resetAll() { - this.server.resetAll(); + if (this.server != null) { + this.server.resetAll(); + } } private void updateGlobalServer() { diff --git a/pom.xml b/pom.xml index 2eb40c2..fe6004a 100644 --- a/pom.xml +++ b/pom.xml @@ -27,13 +27,13 @@ 1.62.2 2.7.6 1.7.36 - 5.8.2 - 3.23.1 - 4.6.1 - 3.16.0 - 4.6.0.0 - 3.8.1 - 2.22.2 + 5.10.2 + 3.25.3 + 5.11.0 + 3.21.2 + 4.8.4.0 + 3.13.0 + 3.2.5 3.0.0 1.6.8 3.0.0 @@ -46,7 +46,7 @@ 4.7.0 3.11.4 - 3.21.2 + 3.26.1 5.1.1 @@ -84,7 +84,7 @@ org.mockito - mockito-inline + mockito-core ${mockito.version} test @@ -132,7 +132,7 @@ Max Low true - FindReturnRef + ConstructorThrow,FindReturnRef