svn commit: r896200 - in /commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp: TestManual.java datasources/TestPerUserPoolDataSource.java

[sebb]

Author: sebb
Date: Tue Jan  5 20:24:50 2010
New Revision: 896200

URL: http://svn.apache.org/viewvc?rev=896200&view=rev
Log:
Revert some recent cosmetic fixes for Java 1.4 compatibility

Modified:
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestManual.java
    
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java

Modified: 
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestManual.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestManual.java?rev=896200&r1=896199&r2=896200&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestManual.java 
(original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestManual.java 
Tue Jan  5 20:24:50 2010
@@ -178,7 +178,6 @@
         assertTrue(conn.isClosed());
     }
 
-    @SuppressWarnings("deprecation") // SQLNestedException
     public void testLogWriter() throws Exception {
         PrintStream ps = new PrintStream(new ByteArrayOutputStream());
         PrintWriter pw = new PrintWriter(new ByteArrayOutputStream());

Modified: 
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java?rev=896200&r1=896199&r2=896200&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java
 Tue Jan  5 20:24:50 2010
@@ -377,7 +377,7 @@
         // some JVMs, e.g. Windows.
         final int defaultMaxWait = 430;
         ((PerUserPoolDataSource) ds).setDefaultMaxWait(defaultMaxWait);
-        ((PerUserPoolDataSource) 
ds).setPerUserMaxWait("foo",Integer.valueOf(defaultMaxWait));
+        ((PerUserPoolDataSource) ds).setPerUserMaxWait("foo",new 
Integer(defaultMaxWait));
         multipleThreads(1, false, defaultMaxWait);
     }