jlengrand/vert.x
1
0
Fork 0
mirror of https://github.com/jlengrand/vert.x.git synced 2026-03-10 08:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

NullPointerException when reporting a deployment failure without a completion handler - fixes #2590

Browse Source
This commit is contained in:
Julien Viet
2018-08-15 00:46:00 +02:00
parent 41fc797a37
commit 07be6b3fd4
3 changed files with 69 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/io/vertx/core/impl/DeploymentManager.java
View File

@@ -102,17 +102,23 @@ public class DeploymentManager {
try {
verticle = verticleSupplier.get();
} catch (Exception e) {
completionHandler.handle(Future.failedFuture(e));
if (completionHandler != null) {
completionHandler.handle(Future.failedFuture(e));
}
return;
}
if (verticle == null) {
completionHandler.handle(Future.failedFuture("Supplied verticle is null"));
if (completionHandler != null) {
completionHandler.handle(Future.failedFuture("Supplied verticle is null"));
}
return;
}
verticles.add(verticle);
}
if (verticles.size() != nbInstances) {
completionHandler.handle(Future.failedFuture("Same verticle supplied more than once"));
if (completionHandler != null) {
completionHandler.handle(Future.failedFuture("Same verticle supplied more than once"));
}
return;
}
Verticle[] verticlesArray = verticles.toArray(new Verticle[verticles.size()]);
@@ -176,7 +182,9 @@ public class DeploymentManager {
try {
deployVerticle(resolvedName, options, completionHandler);
} catch (Exception e) {
completionHandler.handle(Future.failedFuture(e));
if (completionHandler != null) {
completionHandler.handle(Future.failedFuture(e));
}
}
return;
} else {

67
src/test/java/io/vertx/test/core/DeploymentTest.java
View File

@@ -31,13 +31,7 @@ import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -45,6 +39,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import java.util.function.Supplier;
/**
*
@@ -1390,34 +1385,64 @@ public class DeploymentTest extends VertxTestBase {
@Test
public void testDeploySupplier() throws Exception {
JsonObject config = generateJSONObject();
Set<MyVerticle> myVerticles = new HashSet<>();
vertx.deployVerticle(() -> {
Set<MyVerticle> myVerticles = Collections.synchronizedSet(new HashSet<>());
Supplier<Verticle> supplier = () -> {
MyVerticle myVerticle = new MyVerticle();
myVerticles.add(myVerticle);
return myVerticle;
}, new DeploymentOptions().setInstances(4).setConfig(config), onSuccess(deploymentId -> {
};
DeploymentOptions options = new DeploymentOptions().setInstances(4).setConfig(config);
Consumer<String> check = deploymentId -> {
myVerticles.forEach(myVerticle -> {
assertEquals(deploymentId, myVerticle.deploymentID);
assertEquals(config, myVerticle.config);
assertTrue(myVerticle.startCalled);
});
};
// Without completion handler
vertx.deployVerticle(supplier, options);
assertWaitUntil(() -> vertx.deploymentIDs().size() == 1);
String id = vertx.deploymentIDs().iterator().next();
check.accept(id);
myVerticles.clear();
vertx.undeploy(id);
assertWaitUntil(() -> vertx.deploymentIDs().size() == 0);
// With completion handler
vertx.deployVerticle(supplier, options, onSuccess(deploymentId -> {
check.accept(deploymentId);
testComplete();
}));
await();
}
@Test
public void testDeploySupplierNull() throws Exception {
vertx.deployVerticle(() -> null, new DeploymentOptions(), onFailure(t -> {
public void testDeploySupplierNull() {
Supplier<Verticle> supplier = () -> null;
DeploymentOptions options = new DeploymentOptions();
// Without completion handler
vertx.deployVerticle(supplier, options);
assertEquals(Collections.emptySet(), vertx.deploymentIDs());
// With completion handler
vertx.deployVerticle(supplier, options, onFailure(t -> {
assertEquals(Collections.emptySet(), vertx.deploymentIDs());
testComplete();
}));
await();
}
@Test
public void testDeploySupplierDuplicate() throws Exception {
public void testDeploySupplierDuplicate() {
MyVerticle myVerticle = new MyVerticle();
vertx.deployVerticle(() -> myVerticle, new DeploymentOptions().setInstances(2), onFailure(t -> {
Supplier<Verticle> supplier = () -> myVerticle;
DeploymentOptions options = new DeploymentOptions().setInstances(2);
// Without completion handler
vertx.deployVerticle(supplier, options);
assertEquals(Collections.emptySet(), vertx.deploymentIDs());
// With completion handler
vertx.deployVerticle(supplier, options, onFailure(t -> {
assertEquals(Collections.emptySet(), vertx.deploymentIDs());
assertFalse(myVerticle.startCalled);
testComplete();
}));
@@ -1425,17 +1450,23 @@ public class DeploymentTest extends VertxTestBase {
}
@Test
public void testDeploySupplierThrowsException() throws Exception {
vertx.deployVerticle(() -> {
public void testDeploySupplierThrowsException() {
Supplier<Verticle> supplier = () -> {
throw new RuntimeException("boum");
}, new DeploymentOptions().setInstances(2), onFailure(t -> {
};
// Without completion handler
vertx.deployVerticle(supplier, new DeploymentOptions());
assertEquals(Collections.emptySet(), vertx.deploymentIDs());
// With completion handler
vertx.deployVerticle(supplier, new DeploymentOptions().setInstances(2), onFailure(t -> {
assertEquals(Collections.emptySet(), vertx.deploymentIDs());
testComplete();
}));
await();
}
@Test
public void testDeployClass() throws Exception {
public void testDeployClass() {
JsonObject config = generateJSONObject();
vertx.deployVerticle(ReferenceSavingMyVerticle.class, new DeploymentOptions().setInstances(4).setConfig(config), onSuccess(deploymentId -> {
ReferenceSavingMyVerticle.myVerticles.forEach(myVerticle -> {

15
src/test/java/io/vertx/test/core/VerticleFactoryTest.java
View File

@@ -268,13 +268,14 @@ public class VerticleFactoryTest extends VertxTestBase {
}
}; ;
vertx.registerVerticleFactory(fact);
vertx.runOnContext(v -> {
vertx.deployVerticle("resolve:someid", onFailure(err -> {
// Expected since we deploy a non multi-threaded worker verticle
assertEquals(IllegalArgumentException.class, err.getClass());
testComplete();
}));
});
// Without completion handler
vertx.deployVerticle("resolve:someid");
// With completion handler
vertx.deployVerticle("resolve:someid", onFailure(err -> {
// Expected since we deploy a non multi-threaded worker verticle
assertEquals(IllegalArgumentException.class, err.getClass());
testComplete();
}));
await();
}