You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/10/31 19:49:14 UTC

svn commit: r1537583 - in /commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2: TestJndi.java datasources/TestFactory.java

Author: sebb
Date: Thu Oct 31 18:49:14 2013
New Revision: 1537583

URL: http://svn.apache.org/r1537583
Log:
Generics fixes

Modified:
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestFactory.java

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java?rev=1537583&r1=1537582&r2=1537583&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java Thu Oct 31 18:49:14 2013
@@ -148,7 +148,7 @@ public class TestJndi extends TestCase {
      *         or created.
      */
     protected InitialContext getInitialContext() throws NamingException {
-        Hashtable environment = new Hashtable();
+        Hashtable<String, String> environment = new Hashtable<>();
         environment.put(Context.INITIAL_CONTEXT_FACTORY,
                 org.apache.naming.java.javaURLContextFactory.class.getName());
         InitialContext ctx = new InitialContext(environment);

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestFactory.java?rev=1537583&r1=1537582&r2=1537583&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestFactory.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestFactory.java Thu Oct 31 18:49:14 2013
@@ -52,7 +52,7 @@ public class TestFactory extends TestCas
         Reference refObj = new Reference(SharedPoolDataSource.class.getName());
         refObj.add(new StringRefAddr("dataSourceName","java:comp/env/jdbc/bookstoreCPDS"));
         Context context = new InitialContext();
-        Hashtable env = new Hashtable();
+        Hashtable<?, ?> env = new Hashtable<>();
         
         ObjectFactory factory = new SharedPoolDataSourceFactory();