Close socket on error and add missing argument.

raphw · Jun 17, 2020 · 15bb3eb · 15bb3eb
1 parent c259f6e
commit 15bb3eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/byte-buddy-agent/src/main/java/net/bytebuddy/agent/VirtualMachine.java b/byte-buddy-agent/src/main/java/net/bytebuddy/agent/VirtualMachine.java
@@ -1730,6 +1730,7 @@ public static VirtualMachine attach(String processId, int timeout, Dispatcher di
                                     if (answer.contains(' ' + key + ' ')) {
                                         return new ForOpenJ9(socket);
                                     } else {
+                                        socket.close();
                                         throw new IllegalStateException("Unexpected answered to attachment: " + answer);
                                     }
                                 } finally {

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/InvokeDynamic.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/InvokeDynamic.java
@@ -216,6 +216,7 @@ public static WithImplicitTarget bootstrap(MethodDescription.InDefinedShape boot
                 arguments.add(Type.getType(((TypeDescription) constant).getDescriptor()));
                 types.add(TypeDescription.CLASS);
             } else {
+                arguments.add(constant);
                 TypeDescription typeDescription = TypeDescription.ForLoadedType.of(constant.getClass()).asUnboxed();
                 types.add(typeDescription);
                 if (JavaType.METHOD_TYPE.isInstance(constant) || JavaType.METHOD_HANDLE.isInstance(constant)) {