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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2013-11-15 23:37:38 -08:00
parent 127da15c3c
commit 883fd9162f
22 changed files with 72 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java
View File

@@ -60,8 +60,8 @@ public class WebApplicationInitializersConfiguration extends AbstractConfigurati
initializer.onStartup(sce.getServletContext());
}
}
catch (Exception e) {
throw new RuntimeException(e);
catch (Exception ex) {
throw new RuntimeException(ex);
}
}

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

@@ -173,14 +173,16 @@ public class LaunchedURLClassLoader extends URLClassLoader {
}
}
catch (IOException e) {
catch (IOException ex) {
// Ignore
}
}
return null;
}
}, AccessController.getContext());
}
catch (java.security.PrivilegedActionException pae) {
catch (java.security.PrivilegedActionException ex) {
// Ignore
}
}
}

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

@@ -308,7 +308,7 @@ public class PropertiesLauncher extends Launcher {
this.logger.info("Main class from home directory manifest: " + mainClass);
return mainClass;
}
catch (IllegalStateException e) {
catch (IllegalStateException ex) {
// Otherwise try the parent archive
String mainClass = createArchive().getMainClass();
this.logger.info("Main class from archive manifest: " + mainClass);

2
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
View File

@@ -65,7 +65,7 @@ public abstract class Archive {
try {
return getUrl().toString();
}
catch (Exception e) {
catch (Exception ex) {
return "archive";
}
}

8
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java
View File

@@ -44,7 +44,7 @@ import org.springframework.boot.loader.tools.MainClassFinder;
* @author Phillip Webb
*/
@Mojo(name = "run", requiresProject = true, defaultPhase = LifecyclePhase.VALIDATE, requiresDependencyResolution = ResolutionScope.TEST)
@Execute(phase=LifecyclePhase.TEST_COMPILE)
@Execute(phase = LifecyclePhase.TEST_COMPILE)
public class RunMojo extends AbstractMojo {
/**
@@ -179,7 +179,7 @@ public class RunMojo extends AbstractMojo {
hasNonDaemonThreads = true;
thread.join();
}
catch (InterruptedException e) {
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
}
@@ -249,8 +249,8 @@ public class RunMojo extends AbstractMojo {
+ "main method with appropriate signature.", ex);
thread.getThreadGroup().uncaughtException(thread, wrappedEx);
}
catch (Exception e) {
thread.getThreadGroup().uncaughtException(thread, e);
catch (Exception ex) {
thread.getThreadGroup().uncaughtException(thread, ex);
}
}
}