From c35620ae6d2c17761e77f6545f0168733a607538 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 23 Mar 2004 00:19:49 +0000
Subject: [PATCH] Fixed a problem with the JDNI example index page, where an
 exception was thrown if the JDNI datasource was not found.

---
 simplepool-examples/jndi/index.jsp    | 8 +++++++-
 simplepool-examples/servlet/index.jsp | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/simplepool-examples/jndi/index.jsp b/simplepool-examples/jndi/index.jsp
index 4ef704f..bd6a950 100644
--- a/simplepool-examples/jndi/index.jsp
+++ b/simplepool-examples/jndi/index.jsp
@@ -13,7 +13,13 @@
 <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <script language="javascript" type="text/javascript">
-	<% boolean enabled = (new InitialContext().lookup("java:comp/env/jdbc/JNDIPoolDS") != null); %>
+	<%
+		boolean enabled = false;
+			
+		try {
+			enabled = (new InitialContext().lookup("java:comp/env/jdbc/JNDIPoolDS") != null);
+		} catch (Exception ignore) { }
+	%>
 	function RTFM()
 	{
 		alert("Please read the instructions to enable this example.");
diff --git a/simplepool-examples/servlet/index.jsp b/simplepool-examples/servlet/index.jsp
index 4ddbb09..68307da 100644
--- a/simplepool-examples/servlet/index.jsp
+++ b/simplepool-examples/servlet/index.jsp
@@ -65,7 +65,7 @@
               <li>The <code class="info">maxCheckoutSeconds</code> initialization parameter is used to specify the maximum time a connection can be checked out before being recycled. A zero value turns this option off.</li>
             </ul>
             <p>Please note that <em>all parameters are required</em>.</p>
-            <p class="alert">Please take a minute to uncomment the <code>&lt;servlet/&gt;</code> declaration and configure the Servlet's initialization parameters in this webapp's <code>WEB-INF/web.xml</code>. Once done, please restart the webapp and/or Tomcat. The examples will be functional upon restart.</p>
+            <p class="alert">Please take a minute to uncomment the <code>&lt;servlet/&gt;</code> declaration and configure the Servlet's initialization parameters in this webapp's <code><a href="../source.jsp?file=WEB-INF/web.xml">WEB-INF/web.xml</a></code>. Once done, please restart the webapp and/or Tomcat. The examples will be functional upon restart.</p>
             <p>Please look at the [source] of the provided examples to understand how to access the connection pool from a scriptlet or using the JSTL SQL tags. The examples demonstrates how to list all of the tables contained in the specified database.</p>
           </div>
         </div>