Ensure HttpClient#reactorNettyVersion() does not throw NullPointException when loaded through java agent under JDK 1.8 (#3266)

KyoUK4n · violetagg · commit 2222e08e986a · 2024-05-27T12:59:30.000+03:00
diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClient.java b/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClient.java
@@ -1596,9 +1596,11 @@ static boolean isCompressing(HttpHeaders h) {
 	}
 
 	static String reactorNettyVersion() {
-		return Optional.ofNullable(HttpClient.class.getPackage()
-		                                           .getImplementationVersion())
-		               .orElse("dev");
+		Package pac = HttpClient.class.getPackage();
+		if (pac == null) {
+			return "dev";
+		}
+		return Optional.ofNullable(pac.getImplementationVersion()).orElse("dev");
 	}
 
 	static final Logger log = Loggers.getLogger(HttpClient.class);

Original file line number	Diff line number	Diff line change
`@@ -1596,9 +1596,11 @@ static boolean isCompressing(HttpHeaders h) {`
`1596`	`1596`	`}`
`1597`	`1597`
`1598`	`1598`	`static String reactorNettyVersion() {`
`1599`		`- return Optional.ofNullable(HttpClient.class.getPackage()`
`1600`		`- .getImplementationVersion())`
`1601`		`- .orElse("dev");`
	`1599`	`+ Package pac = HttpClient.class.getPackage();`
	`1600`	`+ if (pac == null) {`
	`1601`	`+ return "dev";`
	`1602`	`+ }`
	`1603`	`+ return Optional.ofNullable(pac.getImplementationVersion()).orElse("dev");`
`1602`	`1604`	`}`
`1603`	`1605`
`1604`	`1606`	`static final Logger log = Loggers.getLogger(HttpClient.class);`