Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb 2021-09-21 11:16:46 -07:00
parent 0a4d58f221
commit cfeafee826
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilter.java
View File

@ -106,11 +106,15 @@ public class WebMvcMetricsFilter extends OncePerRequestFilter {
} }
catch (Exception ex) { catch (Exception ex) {
response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
record(timingContext, request, response, (ex instanceof NestedServletException) ? ex.getCause() : ex); record(timingContext, request, response, unwrapNestedServletException(ex));
throw ex; throw ex;
} }
} }
private Throwable unwrapNestedServletException(Throwable ex) {
return (ex instanceof NestedServletException) ? ex.getCause() : ex;
}
private TimingContext startAndAttachTimingContext(HttpServletRequest request) { private TimingContext startAndAttachTimingContext(HttpServletRequest request) {
Timer.Sample timerSample = Timer.start(this.registry); Timer.Sample timerSample = Timer.start(this.registry);
TimingContext timingContext = new TimingContext(timerSample); TimingContext timingContext = new TimingContext(timerSample);

47
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileEntries.java
View File

@ -34,9 +34,9 @@ import org.springframework.boot.loader.data.RandomAccessData;
/** /**
* Provides access to entries from a {@link JarFile}. In order to reduce memory * Provides access to entries from a {@link JarFile}. In order to reduce memory
* consumption entry details are stored using int arrays. The {@code hashCodes} array * consumption entry details are stored using arrays. The {@code hashCodes} array stores
* stores the hash code of the entry name, the {@code centralDirectoryOffsets} provides * the hash code of the entry name, the {@code centralDirectoryOffsets} provides the
* the offset to the central directory record and {@code positions} provides the original * offset to the central directory record and {@code positions} provides the original
* order position of the entry. The arrays are stored in hashCode order so that a binary * order position of the entry. The arrays are stored in hashCode order so that a binary
* search can be used to find a name. * search can be used to find a name.
* <p> * <p>
@ -120,7 +120,7 @@ class JarFileEntries implements CentralDirectoryVisitor, Iterable<JarEntry> {
int maxSize = endRecord.getNumberOfRecords(); int maxSize = endRecord.getNumberOfRecords();
this.centralDirectoryData = centralDirectoryData; this.centralDirectoryData = centralDirectoryData;
this.hashCodes = new int[maxSize]; this.hashCodes = new int[maxSize];
this.centralDirectoryOffsets = Offsets.of(endRecord); this.centralDirectoryOffsets = Offsets.get(endRecord);
this.positions = new int[maxSize]; this.positions = new int[maxSize];
} }
@ -187,12 +187,6 @@ class JarFileEntries implements CentralDirectoryVisitor, Iterable<JarEntry> {
swap(this.positions, i, j); swap(this.positions, i, j);
} }
private static void swap(int[] array, int i, int j) {
int temp = array[i];
array[i] = array[j];
array[j] = temp;
}
@Override @Override
public Iterator<JarEntry> iterator() { public Iterator<JarEntry> iterator() {
return new EntryIterator(NO_VALIDATION); return new EntryIterator(NO_VALIDATION);
@ -388,6 +382,18 @@ class JarFileEntries implements CentralDirectoryVisitor, Iterable<JarEntry> {
return -1; return -1;
} }
private static void swap(int[] array, int i, int j) {
int temp = array[i];
array[i] = array[j];
array[j] = temp;
}
private static void swap(long[] array, int i, int j) {
long temp = array[i];
array[i] = array[j];
array[j] = temp;
}
/** /**
* Iterator for contained entries. * Iterator for contained entries.
*/ */
@ -421,6 +427,11 @@ class JarFileEntries implements CentralDirectoryVisitor, Iterable<JarEntry> {
} }
/**
* Interface to manage offsets to central directory records. Regular zip files are
* backed by an {@code int[]} based implementation, Zip64 files are backed by a
* {@code long[]} and will consume more memory.
*/
private interface Offsets { private interface Offsets {
void set(int index, long value); void set(int index, long value);
@ -429,13 +440,16 @@ class JarFileEntries implements CentralDirectoryVisitor, Iterable<JarEntry> {
void swap(int i, int j); void swap(int i, int j);
static Offsets of(CentralDirectoryEndRecord endRecord) { static Offsets get(CentralDirectoryEndRecord endRecord) {
return endRecord.isZip64() ? new Zip64Offsets(endRecord.getNumberOfRecords()) int size = endRecord.getNumberOfRecords();
: new ZipOffsets(endRecord.getNumberOfRecords()); return endRecord.isZip64() ? new Zip64Offsets(size) : new ZipOffsets(size);
} }
} }
/**
* {@link Offsets} implementation for regular zip files.
*/
private static final class ZipOffsets implements Offsets { private static final class ZipOffsets implements Offsets {
private final int[] offsets; private final int[] offsets;
@ -461,6 +475,9 @@ class JarFileEntries implements CentralDirectoryVisitor, Iterable<JarEntry> {
} }
/**
* {@link Offsets} implementation for zip64 files.
*/
private static final class Zip64Offsets implements Offsets { private static final class Zip64Offsets implements Offsets {
private final long[] offsets; private final long[] offsets;
@ -471,9 +488,7 @@ class JarFileEntries implements CentralDirectoryVisitor, Iterable<JarEntry> {
@Override @Override
public void swap(int i, int j) { public void swap(int i, int j) {
long temp = this.offsets[i]; JarFileEntries.swap(this.offsets, i, j);
this.offsets[i] = this.offsets[j];
this.offsets[j] = temp;
} }
@Override @Override