Changeset 7534

Timestamp:

Nov 27, 2018, 10:48:41 AM (4 years ago)

Author:

Nicklas Nordborg

Message:

References #2130: Upgrade 3-rd party libraries

The change made in [7521] removed the db.driver setting. It was still used in two JSP pages. They have now been updated to use the DriverManager with the db.url setting instead.

Location:

trunk/www

Files:

• exception/exception.jsp (modified) (3 diffs)
• info/about.jsp (modified) (3 diffs)

trunk/www/exception/exception.jsp

@@ -48 +48 @@
   import="javax.servlet.ServletException"
   import="java.sql.Driver"
+  import="java.sql.DriverManager"
   import="java.util.Properties"
   isErrorPage="true"
@@ -102 +103 @@
   }
 
-  final String jdbcDriver = Config.getString("db.driver");
+  final String dbUrl = Config.getString("db.url");
+  String driverName = "unknown";
   String driverVersion = "";
   try
   {
-    final Driver driver = (Driver)Class.forName(jdbcDriver).newInstance();
+    final Driver driver = DriverManager.getDriver(dbUrl);
+    driverName = driver.getClass().getName();
     driverVersion = "(version " + driver.getMajorVersion() + "." + driver.getMinorVersion() + ")";
   }
   catch (Throwable t)
-  {}  
+  {}
+
   final Properties properties = System.getProperties();
   final Runtime runtime = Runtime.getRuntime();
@@ -140 +144 @@
     <tr>
       <th>JDBC Driver</th>
-      <td><%=jdbcDriver%> <%=driverVersion%></td>
+      <td><%=driverName%> <%=driverVersion%></td>
     </tr>
     <tr>

trunk/www/info/about.jsp

@@ -37 +37 @@
   import="net.sf.basedb.util.Values"
   import="java.sql.Driver"
+  import="java.sql.DriverManager"
   import="java.util.Properties"
   import="java.util.List"
@@ -56 +57 @@
 final String activePage = request.getParameter("page");
 
-final String jdbcDriver = Config.getString("db.driver");
+final String dbUrl = Config.getString("db.url");
+String driverName = "unknown";
 String driverVersion = "";
 try
 {
-  final Driver driver = (Driver)Class.forName(jdbcDriver).newInstance();
+  final Driver driver = DriverManager.getDriver(dbUrl);
+  driverName = driver.getClass().getName();
   driverVersion = "(version " + driver.getMajorVersion() + "." + driver.getMinorVersion() + ")";
 }
@@ -143 +146 @@
   <tr>
     <th>JDBC Driver</th>
-    <td class="info"><%=jdbcDriver%> <%=driverVersion%></td>
+    <td class="info"><%=driverName%> <%=driverVersion%></td>
   </tr>
   <tr>