This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new fe5c307 Needs to compile as 1.6 source even though it is compiled
with Java 7
fe5c307 is described below
commit fe5c30726c496f89cf2e1a08cff0cff73af122dd
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Jun 21 21:10:11 2019 +0100
Needs to compile as 1.6 source even though it is compiled with Java 7
---
java/org/apache/tomcat/websocket/server/WsServerContainer.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
index cc2855d..8592a10 100644
--- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
+++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
@@ -81,14 +81,14 @@ public class WsServerContainer extends WsWebSocketContainer
private final WsWriteTimeout wsWriteTimeout = new WsWriteTimeout();
private final ServletContext servletContext;
- private final Map<String,ExactPathMatch> configExactMatchMap = new
ConcurrentHashMap<>();
+ private final Map<String,ExactPathMatch> configExactMatchMap = new
ConcurrentHashMap<String,ExactPathMatch>();
private final
ConcurrentHashMap<Integer,ConcurrentSkipListMap<String,TemplatePathMatch>>
configTemplateMatchMap =
- new ConcurrentHashMap<>();
+ new
ConcurrentHashMap<Integer,ConcurrentSkipListMap<String,TemplatePathMatch>>();
private volatile boolean enforceNoAddAfterHandshake =
org.apache.tomcat.websocket.Constants.STRICT_SPEC_COMPLIANCE;
private volatile boolean addAllowed = true;
private final ConcurrentMap<String,Set<WsSession>> authenticatedSessions =
- new ConcurrentHashMap<>();
+ new ConcurrentHashMap<String,Set<WsSession>>();
private final ExecutorService executorService;
private final ThreadGroup threadGroup;
private volatile boolean endpointsRegistered = false;
@@ -210,7 +210,7 @@ public class WsServerContainer extends WsWebSocketContainer
if (templateMatches == null) {
// Ensure that if concurrent threads execute this block
they
// all end up using the same ConcurrentSkipListMap instance
- templateMatches = new ConcurrentSkipListMap<>();
+ templateMatches = new
ConcurrentSkipListMap<String,TemplatePathMatch>();
configTemplateMatchMap.putIfAbsent(key, templateMatches);
templateMatches = configTemplateMatchMap.get(key);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
