Skip to content

Commit f36b69f

Browse files
committed
Merge branch '3.2.x'
Closes gh-39338
2 parents 5037c37 + be1787e commit f36b69f

File tree

1 file changed

+9
-3
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar

1 file changed

+9
-3
lines changed

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/NestedJarFile.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@ public class NestedJarFile extends JarFile {
101101
* Creates a new {@link NestedJarFile} instance to read from the specific
102102
* {@code File}.
103103
* @param file the jar file to be opened for reading
104-
* @param nestedEntryName the nested entry name to open or {@code null}
104+
* @param nestedEntryName the nested entry name to open
105105
* @throws IOException on I/O error
106+
* @throws IllegalArgumentException if {@code nestedEntryName} is {@code null} or
107+
* empty
106108
*/
107109
public NestedJarFile(File file, String nestedEntryName) throws IOException {
108110
this(file, nestedEntryName, null, true, Cleaner.instance);
@@ -112,9 +114,11 @@ public NestedJarFile(File file, String nestedEntryName) throws IOException {
112114
* Creates a new {@link NestedJarFile} instance to read from the specific
113115
* {@code File}.
114116
* @param file the jar file to be opened for reading
115-
* @param nestedEntryName the nested entry name to open or {@code null}
117+
* @param nestedEntryName the nested entry name to open
116118
* @param version the release version to use when opening a multi-release jar
117119
* @throws IOException on I/O error
120+
* @throws IllegalArgumentException if {@code nestedEntryName} is {@code null} or
121+
* empty
118122
*/
119123
public NestedJarFile(File file, String nestedEntryName, Runtime.Version version) throws IOException {
120124
this(file, nestedEntryName, version, true, Cleaner.instance);
@@ -124,11 +128,13 @@ public NestedJarFile(File file, String nestedEntryName, Runtime.Version version)
124128
* Creates a new {@link NestedJarFile} instance to read from the specific
125129
* {@code File}.
126130
* @param file the jar file to be opened for reading
127-
* @param nestedEntryName the nested entry name to open or {@code null}
131+
* @param nestedEntryName the nested entry name to open
128132
* @param version the release version to use when opening a multi-release jar
129133
* @param onlyNestedJars if <em>only</em> nested jars should be opened
130134
* @param cleaner the cleaner used to release resources
131135
* @throws IOException on I/O error
136+
* @throws IllegalArgumentException if {@code nestedEntryName} is {@code null} or
137+
* empty
132138
*/
133139
NestedJarFile(File file, String nestedEntryName, Runtime.Version version, boolean onlyNestedJars, Cleaner cleaner)
134140
throws IOException {

0 commit comments

Comments
 (0)