7480: Trim method descriptor value

Reviewed-by: hirt
openjdk · Dec 21, 2021 · 1c6ccc9 · 1c6ccc9
1 parent a8b3614
commit 1c6ccc9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/agent/src/main/java/org/openjdk/jmc/agent/impl/DefaultTransformRegistry.java b/agent/src/main/java/org/openjdk/jmc/agent/impl/DefaultTransformRegistry.java
@@ -445,7 +445,7 @@ private static Method parseMethod(
 					if ("name".equals(key)) { //$NON-NLS-1$
 						name = value;
 					} else if ("descriptor".equals(key)) { //$NON-NLS-1$
-						descriptor = value;
+						descriptor = value != null ? value.trim() : null;
 					}
 				}
 			} else if (streamReader.isEndElement()) {

diff --git a/agent/src/test/java/org/openjdk/jmc/agent/test/TestDefaultTransformRegistry.java b/agent/src/test/java/org/openjdk/jmc/agent/test/TestDefaultTransformRegistry.java
@@ -34,7 +34,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -127,7 +126,7 @@ public void testModifyInvalidXml() throws XMLStreamException, IOException, XMLVa
 		final String invalidSnippet = XML_EVENT_DESCRIPTION;
 		boolean exceptionThrown = false;
 		try {
-			Set<String> modifiedClassNames = registry.modify(invalidSnippet);
+			registry.modify(invalidSnippet);
 		} catch (Exception e) {
 			e.printStackTrace(System.err);
 			exceptionThrown = true;