You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by li...@apache.org on 2011/01/13 07:28:32 UTC
svn commit: r1058421 - in /db/derby/code/trunk/java:
engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
testing/org/apache/derbyTesting/junit/BaseTestCase.java
Author: lilywei
Date: Thu Jan 13 06:28:32 2011
New Revision: 1058421
URL: http://svn.apache.org/viewvc?rev=1058421&view=rev
Log:
DERBY-4856 fix building javadoc
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java?rev=1058421&r1=1058420&r2=1058421&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java Thu Jan 13 06:28:32 2011
@@ -418,7 +418,7 @@ public final class TransactionResourceIm
/**
* clean up error and print it to derby.log if diagActive is true
- * @param error the error we want to clean up
+ * @param e the error we want to clean up
* @param diagActive
* true if extended diagnostics should be considered,
* false not interested of extended diagnostic information
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=1058421&r1=1058420&r2=1058421&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Thu Jan 13 06:28:32 2011
@@ -297,7 +297,7 @@ public abstract class BaseTestCase
* The directory we are checking for files with certain prefix
* @param prefix
* The prefix pattern we are interested.
- * @retrun String[] The list indicates files with certain prefix.
+ * @return The list indicates files with certain prefix.
*/
protected static String[] getFilesWith(final File dir, String prefix) {
return (String[]) AccessController