From 2077388f383c9c57fcf9473b3def51dacea3cdf3 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Thu, 18 Sep 2014 23:09:45 -0700
Subject: [PATCH] Improve JNDI detection logic

Update JndiLocatorDelegate.isDefaultJndiEnvironmentAvailable() to
call `getEnvironment()` on the `InitialContext` in order to actually
trigger a NamingException if JNDI is not available.

Issue: SPR-12223
---
 .../jndi/JndiLocatorDelegate.java             |  2 +-
 .../jndi/JndiLocatorDelegateTests.java        | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java

diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
index cd7ed96288..2aa2552024 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
@@ -58,7 +58,7 @@ public class JndiLocatorDelegate extends JndiLocatorSupport {
 	 */
 	public static boolean isDefaultJndiEnvironmentAvailable() {
 		try {
-			new InitialContext();
+			new InitialContext().getEnvironment();
 			return true;
 		}
 		catch (Throwable ex) {
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java
new file mode 100644
index 0000000000..2a2cc3e744
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.jndi;
+
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.*;
+
+import static org.junit.Assert.*;
+
+/**
+ * Tests for {@link JndiLocatorDelegate}.
+ *
+ * @author Phillip Webb
+ */
+public class JndiLocatorDelegateTests {
+
+	@Test
+	public void isDefaultJndiEnvironmentAvailableFalse() {
+		assertThat(JndiLocatorDelegate.isDefaultJndiEnvironmentAvailable(), equalTo(false));
+	}
+
+}