[tomcat] branch 7.0.x updated: Fix backport / alignment errors

2019-07-10 Thread markt 
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 7916724  Fix backport / alignment errors
7916724 is described below

commit 7916724e7517517e6444cee789a1c356f8b43fc5
Author: Mark Thomas 
AuthorDate: Wed Jul 10 10:33:28 2019 +0100

Fix backport / alignment errors
---
 java/org/apache/naming/NamingContext.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/naming/NamingContext.java 
b/java/org/apache/naming/NamingContext.java
index 5c22b3c..ee83701 100644
--- a/java/org/apache/naming/NamingContext.java
+++ b/java/org/apache/naming/NamingContext.java
@@ -72,7 +72,7 @@ public class NamingContext implements Context {
  * @param env The environment to use to construct the naming context
  * @param name The name of the associated Catalina Context
  */
-public NamingContext(Hashtable env, String name) {
+public NamingContext(Hashtable env, String name) throws 
NamingException {
 this(env, name, new HashMap());
 }
 
@@ -85,9 +85,9 @@ public class NamingContext implements Context {
  * @param bindings The initial bindings for the naming context
  */
 public NamingContext(Hashtable env, String name,
-HashMap bindings) {
+HashMap bindings) throws NamingException {
 
-this.env = new Hashtable<>();
+this.env = new Hashtable();
 this.name = name;
 // Populating the environment hashtable
 if (env != null ) {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: Fix backport

2019-05-01 Thread markt 
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 e2bb82b  Fix backport
e2bb82b is described below

commit e2bb82b0f4ae43634fe7d955e0bfbc2f7b2ac849
Author: Mark Thomas 
AuthorDate: Wed May 1 11:55:30 2019 +0100

Fix backport
---
 test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java 
b/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
index 0d6a46a..30021fb 100644
--- a/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
+++ b/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
@@ -48,7 +48,7 @@ public class TestCrawlerSessionManagerValve {
 
 static {
 TEST_MANAGER = new StandardManager();
-TEST_MANAGER.setContext(new StandardContext());
+TEST_MANAGER.setContainer(new StandardContext());
 }
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: Fix backport of <> which is not supported in Java 6

2019-03-14 Thread markt 
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 
AuthorDate: Thu Mar 14 13:44:27 2019 +

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 cache = new ConcurrentHashMap<>();
+private ConcurrentMap cache = new 
ConcurrentHashMap();
 
 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 cacheMisses = new ArrayList<>();
+List cacheMisses = new ArrayList();
 
 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 cache = new HashMap<>();
+private static final Map cache = new HashMap();
 
 static {
 for (Charset charset: Charset.availableCharsets().values()) {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org