You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/11/08 12:44:36 UTC
tomee git commit: TOMEE-1966 tomcat 8.5.8
Repository: tomee
Updated Branches:
refs/heads/master 579b74524 -> aca5ceb13
TOMEE-1966 tomcat 8.5.8
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/aca5ceb1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/aca5ceb1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/aca5ceb1
Branch: refs/heads/master
Commit: aca5ceb13a2c0a8370c948374746c695111e6f1e
Parents: 579b745
Author: rmannibucau <rm...@apache.org>
Authored: Tue Nov 8 13:44:18 2016 +0100
Committer: rmannibucau <rm...@apache.org>
Committed: Tue Nov 8 13:44:18 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
.../org/apache/tomee/embedded/Container.java | 20 ++++----------------
2 files changed, 5 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/aca5ceb1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dc450b5..b7e9027 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<version.shrinkwrap.descriptor>2.0.0-alpha-7</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.2</version.shrinkwrap.shrinkwrap>
- <tomcat.version>8.5.6</tomcat.version>
+ <tomcat.version>8.5.8</tomcat.version>
<cxf.version>3.1.8</cxf.version>
<ehcache.version>2.9.0</ehcache.version>
http://git-wip-us.apache.org/repos/asf/tomee/blob/aca5ceb1/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
index 4a30f0e..50cfd05 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
@@ -1090,24 +1090,12 @@ public class Container implements AutoCloseable {
}
private static class InternalTomcat extends Tomcat {
+ private Connector connector;
+
private void server(final Server s) {
server = s;
- if (service == null) {
- final Service[] services = server.findServices();
- if (services.length > 0) {
- service = services[0];
- if (service.getContainer() != null) {
- engine = Engine.class.cast(service.getContainer());
- final org.apache.catalina.Container[] hosts = engine.findChildren();
- if (hosts.length > 0) {
- host = Host.class.cast(hosts[0]);
- }
- }
- }
- if (service.findConnectors().length > 0) {
- connector = service.findConnectors()[0];
- }
- }
+ connector = server != null && server.findServices().length > 0 && server.findServices()[0].findConnectors().length > 0 ?
+ server.findServices()[0].findConnectors()[0] : null;
}
public Connector getRawConnector() {