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 b277f1f Fix backport of <> which is not supported in Java 6
b277f1f is described below
commit b277f1fd4b4ea8fb78e722d42bd0d171829908d5
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Mar 14 13:44:27 2019 +0000
Fix backport of <> which is not supported in Java 6
---
java/org/apache/tomcat/util/buf/CharsetCache.java | 2 +-
test/org/apache/tomcat/util/buf/TestCharsetCache.java | 2 +-
test/org/apache/tomcat/util/buf/TestCharsetCachePerformance.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/CharsetCache.java
b/java/org/apache/tomcat/util/buf/CharsetCache.java
index bde4583..1558c88 100644
--- a/java/org/apache/tomcat/util/buf/CharsetCache.java
+++ b/java/org/apache/tomcat/util/buf/CharsetCache.java
@@ -60,7 +60,7 @@ public class CharsetCache {
private static final Charset DUMMY_CHARSET = new DummyCharset("Dummy",
null);
- private ConcurrentMap<String,Charset> cache = new ConcurrentHashMap<>();
+ private ConcurrentMap<String,Charset> cache = new
ConcurrentHashMap<String, Charset>();
public CharsetCache() {
// Pre-populate the cache
diff --git a/test/org/apache/tomcat/util/buf/TestCharsetCache.java
b/test/org/apache/tomcat/util/buf/TestCharsetCache.java
index 011b08c..d8916e8 100644
--- a/test/org/apache/tomcat/util/buf/TestCharsetCache.java
+++ b/test/org/apache/tomcat/util/buf/TestCharsetCache.java
@@ -31,7 +31,7 @@ public class TestCharsetCache {
public void testAllKnownCharsets() {
CharsetCache cache = new CharsetCache();
- List<String> cacheMisses = new ArrayList<>();
+ List<String> cacheMisses = new ArrayList<String>();
for (Charset charset: Charset.availableCharsets().values()) {
if (cache.getCharset(charset.name()) == null) {
diff --git a/test/org/apache/tomcat/util/buf/TestCharsetCachePerformance.java
b/test/org/apache/tomcat/util/buf/TestCharsetCachePerformance.java
index 6823890..574a7a8 100644
--- a/test/org/apache/tomcat/util/buf/TestCharsetCachePerformance.java
+++ b/test/org/apache/tomcat/util/buf/TestCharsetCachePerformance.java
@@ -87,7 +87,7 @@ public class TestCharsetCachePerformance {
private static class FullCsCache implements CsCache {
- private static final Map<String,Charset> cache = new HashMap<>();
+ private static final Map<String,Charset> cache = new HashMap<String,
Charset>();
static {
for (Charset charset: Charset.availableCharsets().values()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
