Skip to content

Commit 2353671

Browse files
committed
[ARIES-2159] fix NPE when DatabaseMetaData wants to get connection from DummyDataSource.
1 parent 58cc054 commit 2353671

File tree

2 files changed

+49
-0
lines changed

2 files changed

+49
-0
lines changed

jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ private Object proxyClasses(ClassLoader classLoader, Class<?> type) {
6767
if (type == Statement.class) {
6868
return createProxy(classLoader, PreparedStatement.class);
6969
}
70+
if (type == Connection.class) {
71+
return createProxy(classLoader, Connection.class);
72+
}
7073
return null;
7174
}
7275

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIESOR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.apache.aries.jpa.container.weaving.impl;
20+
21+
import java.sql.Connection;
22+
import java.sql.DatabaseMetaData;
23+
import static org.junit.Assert.assertTrue;
24+
import org.junit.Test;
25+
26+
public class DummyDataSourceTest {
27+
28+
@Test
29+
public void testGetConnection_String_String() throws Exception {
30+
DummyDataSource ds = new DummyDataSource();
31+
Connection connection = ds.getConnection("test", "test");
32+
DatabaseMetaData databaseMetaData = connection.getMetaData();
33+
Connection connectionFromMetaData = databaseMetaData.getConnection();
34+
assertTrue(connectionFromMetaData != null);
35+
}
36+
37+
@Test
38+
public void testGetConnection_0args() throws Exception {
39+
DummyDataSource ds = new DummyDataSource();
40+
Connection connection = ds.getConnection();
41+
DatabaseMetaData databaseMetaData = connection.getMetaData();
42+
Connection connectionFromMetaData = databaseMetaData.getConnection();
43+
assertTrue(connectionFromMetaData != null);
44+
}
45+
46+
}

0 commit comments

Comments
 (0)