db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1619274 - in /db/derby/code/branches/10.11: ./ java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
Date Thu, 21 Aug 2014 01:11:15 GMT
Author: myrnavl
Date: Thu Aug 21 01:11:14 2014
New Revision: 1619274

URL: http://svn.apache.org/r1619274
Log:
DERBY-6704; Hang in AutoloadTest.spawnProcess:JDBCDriversEmbeddedTest on Mac/jdk7,8
   merge of revision 1618859 from trunk to cleanup javadoc warnings.

Modified:
    db/derby/code/branches/10.11/   (props changed)
    db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
    db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java

Propchange: db/derby/code/branches/10.11/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1618859

Modified: db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java?rev=1619274&r1=1619273&r2=1619274&view=diff
==============================================================================
--- db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
(original)
+++ db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
Thu Aug 21 01:11:14 2014
@@ -72,7 +72,7 @@ public class AutoloadTest extends BaseJD
 
     /**
      * Get the name of the test case.
-     * @return
+     * @return the test name
      */
     @Override
     public String getName() {

Modified: db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=1619274&r1=1619273&r2=1619274&view=diff
==============================================================================
--- db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
(original)
+++ db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
Thu Aug 21 01:11:14 2014
@@ -613,8 +613,7 @@ public abstract class BaseTestCase
 	}
 
     /**
-     * Same as {@link #execJavaCmd(
-     * String jvm, String cp, String[] cmd, final File dir, boolean addClassPath)}
+     * Same as {@link #execJavaCmd( String, String, String[], File, boolean )}
      * but with {@code addClassPath == true}.
      */
     public static Process execJavaCmd(



Mime
View raw message