Merge branch '3.4.x'

Closes gh-43927

Author: wilkinsona

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/info/ProcessInfoTests.java

@@ -47,13 +47,13 @@ void processInfoIsAvailable() {
 	void memoryInfoIsAvailable() {
 		ProcessInfo processInfo = new ProcessInfo();
 		MemoryUsageInfo heapUsageInfo = processInfo.getMemory().getHeap();
-		MemoryUsageInfo nonHeapUsageInfo = processInfo.getMemory().getNonHeap();
 		assertThat(heapUsageInfo.getInit()).isPositive().isLessThanOrEqualTo(heapUsageInfo.getMax());
 		assertThat(heapUsageInfo.getUsed()).isPositive().isLessThanOrEqualTo(heapUsageInfo.getCommitted());
 		assertThat(heapUsageInfo.getCommitted()).isPositive().isLessThanOrEqualTo(heapUsageInfo.getMax());
 		assertThat(heapUsageInfo.getMax()).isPositive();
+		MemoryUsageInfo nonHeapUsageInfo = processInfo.getMemory().getNonHeap();
 		assertThat(nonHeapUsageInfo.getInit()).isPositive();
-		assertThat(nonHeapUsageInfo.getUsed()).isPositive().isLessThanOrEqualTo(heapUsageInfo.getCommitted());
+		assertThat(nonHeapUsageInfo.getUsed()).isPositive().isLessThanOrEqualTo(nonHeapUsageInfo.getCommitted());
 		assertThat(nonHeapUsageInfo.getCommitted()).isPositive();
 		assertThat(nonHeapUsageInfo.getMax()).isEqualTo(-1);
 	}