h2database
diff --git a/‎h2/src/main/org/h2/util/JdbcUtils.java‎
Lines changed: 3 additions & 0 deletions b/‎h2/src/main/org/h2/util/JdbcUtils.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎h2/src/test/org/h2/test/unit/TestTools.java‎
Lines changed: 7 additions & 0 deletions b/‎h2/src/test/org/h2/test/unit/TestTools.java‎
Lines changed: 7 additions & 0 deletions
@@ -315,6 +315,9 @@ public static Connection getConnection(String driver, String url, String user, S
                     }
                     throw new SQLException("Driver " + driver + " is not suitable for " + url, "08001");
                 } else if (javax.naming.Context.class.isAssignableFrom(d)) {
+                    if (!url.startsWith("java:")) {
+                        throw new SQLException("Only java scheme is supported for JNDI lookups", "08001");
+                    }
                     // JNDI context
                     Context context = (Context) d.getDeclaredConstructor().newInstance();
                     DataSource ds = (DataSource) context.lookup(url);
 
@@ -531,6 +531,13 @@ private void testJdbcDriverUtils() {
         } catch (SQLException e) {
             assertEquals("08001", e.getSQLState());
         }
+        try {
+            JdbcUtils.getConnection("javax.naming.InitialContext", "ldap://localhost/ds", "sa", "");
+            fail("Expected SQLException: 08001");
+        } catch (SQLException e) {
+            assertEquals("08001", e.getSQLState());
+            assertEquals("Only java scheme is supported for JNDI lookups", e.getMessage());
+        }
     }
 
     private void testWrongServer() throws Exception {
Original file line number	Diff line number	Diff line change
`@@ -531,6 +531,13 @@ private void testJdbcDriverUtils() {`
`531`	`531`	`} catch (SQLException e) {`
`532`	`532`	`assertEquals("08001", e.getSQLState());`
`533`	`533`	`}`
	`534`	`+ try {`
	`535`	`+ JdbcUtils.getConnection("javax.naming.InitialContext", "ldap://localhost/ds", "sa", "");`
	`536`	`+ fail("Expected SQLException: 08001");`
	`537`	`+ } catch (SQLException e) {`
	`538`	`+ assertEquals("08001", e.getSQLState());`
	`539`	`+ assertEquals("Only java scheme is supported for JNDI lookups", e.getMessage());`
	`540`	`+ }`
`534`	`541`	`}`
`535`	`542`
`536`	`543`	`private void testWrongServer() throws Exception {`