This is an automated email from the ASF dual-hosted git repository.
isapir pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 1343a38 Trivial formatting for consistency and readability
1343a38 is described below
commit 1343a38cb6a4aab5f892cc265e273c71ccb60bb8
Author: Igal Sapir <isa...@apache.org>
AuthorDate: Fri Apr 26 20:43:35 2019 -0700
Trivial formatting for consistency and readability
---
java/org/apache/catalina/startup/Bootstrap.java | 57 +++++++++----------------
1 file changed, 20 insertions(+), 37 deletions(-)
diff --git a/java/org/apache/catalina/startup/Bootstrap.java
b/java/org/apache/catalina/startup/Bootstrap.java
index 4b3a315..ac2bfe5 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -133,7 +133,6 @@ public final class Bootstrap {
*/
private Object catalinaDaemon = null;
-
ClassLoader commonLoader = null;
ClassLoader catalinaLoader = null;
ClassLoader sharedLoader = null;
@@ -145,9 +144,9 @@ public final class Bootstrap {
private void initClassLoaders() {
try {
commonLoader = createClassLoader("common", null);
- if( commonLoader == null ) {
+ if (commonLoader == null) {
// no config file, default to this loader - we might be in a
'single' env.
- commonLoader=this.getClass().getClassLoader();
+ commonLoader = this.getClass().getClassLoader();
}
catalinaLoader = createClassLoader("server", commonLoader);
sharedLoader = createClassLoader("shared", commonLoader);
@@ -276,15 +275,13 @@ public final class Bootstrap {
method.invoke(startupInstance, paramValues);
catalinaDaemon = startupInstance;
-
}
/**
* Load daemon.
*/
- private void load(String[] arguments)
- throws Exception {
+ private void load(String[] arguments) throws Exception {
// Call the load() method
String methodName = "load";
@@ -301,10 +298,10 @@ public final class Bootstrap {
}
Method method =
catalinaDaemon.getClass().getMethod(methodName, paramTypes);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Calling startup class " + method);
+ }
method.invoke(catalinaDaemon, param);
-
}
@@ -314,10 +311,8 @@ public final class Bootstrap {
private Object getServer() throws Exception {
String methodName = "getServer";
- Method method =
- catalinaDaemon.getClass().getMethod(methodName);
+ Method method = catalinaDaemon.getClass().getMethod(methodName);
return method.invoke(catalinaDaemon);
-
}
@@ -329,12 +324,10 @@ public final class Bootstrap {
* @param arguments Initialization arguments
* @throws Exception Fatal initialization error
*/
- public void init(String[] arguments)
- throws Exception {
+ public void init(String[] arguments) throws Exception {
init();
load(arguments);
-
}
@@ -342,13 +335,13 @@ public final class Bootstrap {
* Start the Catalina daemon.
* @throws Exception Fatal start error
*/
- public void start()
- throws Exception {
- if( catalinaDaemon==null ) init();
+ public void start() throws Exception {
+ if (catalinaDaemon == null) {
+ init();
+ }
- Method method = catalinaDaemon.getClass().getMethod("start", (Class []
)null);
+ Method method = catalinaDaemon.getClass().getMethod("start", (Class
[])null);
method.invoke(catalinaDaemon, (Object [])null);
-
}
@@ -356,12 +349,9 @@ public final class Bootstrap {
* Stop the Catalina Daemon.
* @throws Exception Fatal stop error
*/
- public void stop()
- throws Exception {
-
- Method method = catalinaDaemon.getClass().getMethod("stop", (Class []
) null);
- method.invoke(catalinaDaemon, (Object [] ) null);
-
+ public void stop() throws Exception {
+ Method method = catalinaDaemon.getClass().getMethod("stop", (Class [])
null);
+ method.invoke(catalinaDaemon, (Object []) null);
}
@@ -369,13 +359,11 @@ public final class Bootstrap {
* Stop the standalone server.
* @throws Exception Fatal stop error
*/
- public void stopServer()
- throws Exception {
+ public void stopServer() throws Exception {
Method method =
catalinaDaemon.getClass().getMethod("stopServer", (Class []) null);
method.invoke(catalinaDaemon, (Object []) null);
-
}
@@ -384,12 +372,11 @@ public final class Bootstrap {
* @param arguments Command line arguments
* @throws Exception Fatal stop error
*/
- public void stopServer(String[] arguments)
- throws Exception {
+ public void stopServer(String[] arguments) throws Exception {
Object param[];
Class<?> paramTypes[];
- if (arguments==null || arguments.length==0) {
+ if (arguments == null || arguments.length == 0) {
paramTypes = null;
param = null;
} else {
@@ -401,7 +388,6 @@ public final class Bootstrap {
Method method =
catalinaDaemon.getClass().getMethod("stopServer", paramTypes);
method.invoke(catalinaDaemon, param);
-
}
@@ -420,12 +406,9 @@ public final class Bootstrap {
Method method =
catalinaDaemon.getClass().getMethod("setAwait", paramTypes);
method.invoke(catalinaDaemon, paramValues);
-
}
- public boolean getAwait()
- throws Exception
- {
+ public boolean getAwait() throws Exception {
Class<?> paramTypes[] = new Class[0];
Object paramValues[] = new Object[0];
Method method =
@@ -514,7 +497,6 @@ public final class Bootstrap {
t.printStackTrace();
System.exit(1);
}
-
}
@@ -608,6 +590,7 @@ public final class Bootstrap {
result.add(path);
}
+
return result.toArray(new String[result.size()]);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
