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 <[email protected]>
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<String,Object> env, String name) {
+ public NamingContext(Hashtable<String,Object> env, String name) throws
NamingException {
this(env, name, new HashMap<String,NamingEntry>());
}
@@ -85,9 +85,9 @@ public class NamingContext implements Context {
* @param bindings The initial bindings for the naming context
*/
public NamingContext(Hashtable<String,Object> env, String name,
- HashMap<String,NamingEntry> bindings) {
+ HashMap<String,NamingEntry> bindings) throws NamingException {
- this.env = new Hashtable<>();
+ this.env = new Hashtable<String,Object>();
this.name = name;
// Populating the environment hashtable
if (env != null ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
