From 0c8d0573b83b0353025f3c7ded44401d495a0acc Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 8 Feb 2010 17:07:28 +0000
Subject: [PATCH] Allow the global naming context to be reset. Useful when
 running multiple embedded instances in series since it allows each instance
 to configure its own global naming context. Doesn't help with multiple
 instances in parallel - but that was broken anyway.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@907727 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/naming/factory/ResourceLinkFactory.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/java/org/apache/naming/factory/ResourceLinkFactory.java b/java/org/apache/naming/factory/ResourceLinkFactory.java
index b0c4a10c5..d67ceccff 100644
--- a/java/org/apache/naming/factory/ResourceLinkFactory.java
+++ b/java/org/apache/naming/factory/ResourceLinkFactory.java
@@ -62,8 +62,6 @@ public class ResourceLinkFactory
      * @param newGlobalContext new global context value
      */
     public static void setGlobalContext(Context newGlobalContext) {
-        if (globalContext != null)
-            return;
         globalContext = newGlobalContext;
     }
 
-- 
2.11.0