You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/09/27 16:34:29 UTC
[tomcat] branch master updated (4f5bdbc -> e324fb4)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 4f5bdbc Add Graal ease of use for EL
new 0d913e1 Fix indent
new bf2e8b4 Polish
new 348336d Polish - spacing
new 7e40809 Polish - spacing
new 03bbbad Polish - spacing
new e324fb4 Polish -spacing
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/Service.java | 3 --
java/org/apache/catalina/core/StandardHost.java | 37 +++++++++++-----------
.../org/apache/catalina/core/StandardPipeline.java | 5 ---
java/org/apache/catalina/core/StandardServer.java | 3 --
.../org/apache/catalina/mbeans/ContainerMBean.java | 4 +--
java/org/apache/catalina/mbeans/MBeanFactory.java | 1 -
6 files changed, 20 insertions(+), 33 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/06: Fix indent
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0d913e166a41bf219b09109cdc47df7e0e0be5c7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 27 13:55:27 2019 +0100
Fix indent
---
java/org/apache/catalina/core/StandardHost.java | 37 ++++++++++++-------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardHost.java b/java/org/apache/catalina/core/StandardHost.java
index 2f561d5..1739834 100644
--- a/java/org/apache/catalina/core/StandardHost.java
+++ b/java/org/apache/catalina/core/StandardHost.java
@@ -844,25 +844,24 @@ public class StandardHost extends ContainerBase implements Host {
// -------------------- JMX --------------------
/**
- * @return the MBean Names of the Valves associated with this Host
- *
- * @exception Exception if an MBean cannot be created or registered
- */
- public String[] getValveNames() throws Exception {
- Valve [] valves = this.getPipeline().getValves();
- String [] mbeanNames = new String[valves.length];
- for (int i = 0; i < valves.length; i++) {
- if (valves[i] instanceof JmxEnabled) {
- ObjectName oname = ((JmxEnabled) valves[i]).getObjectName();
- if (oname != null) {
- mbeanNames[i] = oname.toString();
- }
- }
- }
-
- return mbeanNames;
-
- }
+ * @return the MBean Names of the Valves associated with this Host
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+ public String[] getValveNames() throws Exception {
+ Valve [] valves = this.getPipeline().getValves();
+ String [] mbeanNames = new String[valves.length];
+ for (int i = 0; i < valves.length; i++) {
+ if (valves[i] instanceof JmxEnabled) {
+ ObjectName oname = ((JmxEnabled) valves[i]).getObjectName();
+ if (oname != null) {
+ mbeanNames[i] = oname.toString();
+ }
+ }
+ }
+
+ return mbeanNames;
+ }
public String[] getAliases() {
synchronized (aliasesLock) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/06: Polish - spacing
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 348336d04f02bcafefb2b6219625a6a6bc0e16ad
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 27 16:12:45 2019 +0100
Polish - spacing
---
java/org/apache/catalina/core/StandardPipeline.java | 5 -----
1 file changed, 5 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardPipeline.java b/java/org/apache/catalina/core/StandardPipeline.java
index 212cc8a..16143bb 100644
--- a/java/org/apache/catalina/core/StandardPipeline.java
+++ b/java/org/apache/catalina/core/StandardPipeline.java
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.core;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -40,7 +37,6 @@ import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
-
/**
* Standard implementation of a processing <b>Pipeline</b> that will invoke
* a series of Valves that have been configured to be called in order. This
@@ -53,7 +49,6 @@ import org.apache.tomcat.util.res.StringManager;
*
* @author Craig R. McClanahan
*/
-
public class StandardPipeline extends LifecycleBase implements Pipeline {
private static final Log log = LogFactory.getLog(StandardPipeline.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/06: Polish - spacing
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 03bbbad1ad8900c6f16d87c06db86b860bf9b788
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 27 16:45:22 2019 +0100
Polish - spacing
---
java/org/apache/catalina/mbeans/ContainerMBean.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/mbeans/ContainerMBean.java b/java/org/apache/catalina/mbeans/ContainerMBean.java
index 511b117..0798f32 100644
--- a/java/org/apache/catalina/mbeans/ContainerMBean.java
+++ b/java/org/apache/catalina/mbeans/ContainerMBean.java
@@ -134,7 +134,7 @@ public class ContainerMBean extends BaseCatalinaMBean<ContainerBase> {
throw new MBeanException(e);
}
- if (container != null){
+ if (container != null) {
Valve[] valves = container.getPipeline().getValves();
for (int i = 0; i < valves.length; i++) {
if (valves[i] instanceof JmxEnabled) {
@@ -153,7 +153,7 @@ public class ContainerMBean extends BaseCatalinaMBean<ContainerBase> {
*
* @param type ClassName of the listener to add
* @throws MBeanException if adding the listener failed
- */
+ */
public void addLifecycleListener(String type) throws MBeanException{
LifecycleListener listener = (LifecycleListener) newInstance(type);
Container container = doGetManagedResource();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/06: Polish
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit bf2e8b4a82b92825f43a90fe5fd9f4f978cd67d4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 27 16:02:03 2019 +0100
Polish
---
java/org/apache/catalina/Service.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/java/org/apache/catalina/Service.java b/java/org/apache/catalina/Service.java
index 112df9d..32daaa8 100644
--- a/java/org/apache/catalina/Service.java
+++ b/java/org/apache/catalina/Service.java
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina;
import org.apache.catalina.connector.Connector;
@@ -151,5 +149,4 @@ public interface Service extends Lifecycle {
* @return the mapper associated with this Service.
*/
Mapper getMapper();
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/06: Polish - spacing
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7e408091b882f0e50d9bcfa722541a215fe35d60
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 27 16:30:55 2019 +0100
Polish - spacing
---
java/org/apache/catalina/core/StandardServer.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardServer.java b/java/org/apache/catalina/core/StandardServer.java
index 2bf87a1..55cee1b 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -712,9 +712,7 @@ public final class StandardServer extends LifecycleMBeanBase implements Server {
*/
@Override
public Service[] findServices() {
-
return services;
-
}
/**
@@ -1145,5 +1143,4 @@ public final class StandardServer extends LifecycleMBeanBase implements Server {
public ScheduledExecutorService getUtilityExecutor() {
return utilityExecutorWrapper;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 06/06: Polish -spacing
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e324fb4906d5bf04cc951746b45ef97af07a4983
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 27 17:01:32 2019 +0100
Polish -spacing
---
java/org/apache/catalina/mbeans/MBeanFactory.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/mbeans/MBeanFactory.java b/java/org/apache/catalina/mbeans/MBeanFactory.java
index 30cbda4..3c7bd1e 100644
--- a/java/org/apache/catalina/mbeans/MBeanFactory.java
+++ b/java/org/apache/catalina/mbeans/MBeanFactory.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.mbeans;
import java.io.File;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org