This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new ef164a3 Align format with 9.0.x ef164a3 is described below commit ef164a362e0f2bc3e7c9e731097fc0397cae31ea Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jul 27 16:47:54 2021 +0100 Align format with 9.0.x --- java/org/apache/naming/NamingContext.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java/org/apache/naming/NamingContext.java b/java/org/apache/naming/NamingContext.java index 4fc8b41..faed240 100644 --- a/java/org/apache/naming/NamingContext.java +++ b/java/org/apache/naming/NamingContext.java @@ -843,9 +843,8 @@ public class NamingContext implements Context { } } else if (entry.type == NamingEntry.REFERENCE) { try { - Object obj = NamingManager.getObjectInstance - (entry.value, name, this, env); - if(entry.value instanceof ResourceRef) { + Object obj = NamingManager.getObjectInstance(entry.value, name, this, env); + if (entry.value instanceof ResourceRef) { boolean singleton = Boolean.parseBoolean( (String) ((ResourceRef) entry.value).get( "singleton").getContent()); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org