Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Phillip Webb
2018-05-03 12:44:58 -07:00
parent 36a377764f e125085993
commit 8c0c0ee55a
138 changed files with 274 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/DefaultLaunchScript.java
View File

@@ -109,8 +109,8 @@ public class DefaultLaunchScript implements LaunchScript {
}
}
else {
value = (defaultValue == null ? matcher.group(0)
: defaultValue.substring(1));
value = (defaultValue != null ? defaultValue.substring(1)
: matcher.group(0));
}
matcher.appendReplacement(expanded, value.replace("$", "\\$"));
}

6
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
View File

@@ -356,7 +356,7 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable {
@Override
public int read() throws IOException {
int read = (this.headerStream == null ? -1 : this.headerStream.read());
int read = (this.headerStream != null ? this.headerStream.read() : -1);
if (read != -1) {
this.headerStream = null;
return read;
@@ -371,8 +371,8 @@ public class JarWriter implements LoaderClassesWriter, AutoCloseable {
@Override
public int read(byte[] b, int off, int len) throws IOException {
int read = (this.headerStream == null ? -1
: this.headerStream.read(b, off, len));
int read = (this.headerStream != null ? this.headerStream.read(b, off, len)
: -1);
if (read != -1) {
this.headerStream = null;
return read;

2
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Library.java
View File

@@ -63,7 +63,7 @@ public class Library {
* @param unpackRequired if the library needs to be unpacked before it can be used
*/
public Library(String name, File file, LibraryScope scope, boolean unpackRequired) {
this.name = (name == null ? file.getName() : name);
this.name = (name != null ? name : file.getName());
this.file = file;
this.scope = scope;
this.unpackRequired = unpackRequired;

4
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
View File

@@ -452,8 +452,8 @@ public abstract class MainClassFinder {
"Unable to find a single main class from the following candidates "
+ matchingMainClasses);
}
return matchingMainClasses.isEmpty() ? null
: matchingMainClasses.iterator().next().getName();
return (matchingMainClasses.isEmpty() ? null
: matchingMainClasses.iterator().next().getName());
}
}