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 my...@apache.org on 2013/08/08 21:30:49 UTC
svn commit: r1511979 - in /db/derby/code/branches/10.8: ./
java/client/org/apache/derby/client/net/NetCursor.java
java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java
Author: myrnavl
Date: Thu Aug 8 19:30:49 2013
New Revision: 1511979
URL: http://svn.apache.org/r1511979
Log:
DERBY-5283; Crash / process termination during SYSCS_DISABLE_LOG_ARCHIVE_MODE can leave service.properties broken
fixing a javadoc warning by merging the fix from trunk.
merge command: svn merge -c 1188144 https://svn.apache.org/repos/asf/db/derby/code/trunk
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java (props changed)
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1188144
Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
Merged /db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:r1188144
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java?rev=1511979&r1=1511978&r2=1511979&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java Thu Aug 8 19:30:49 2013
@@ -351,7 +351,7 @@ public class ServicePropertiesFileTest
spfOld = new File(newDb, "service.propertiesold");
}
- /** Dependent on state set by {@linkplain copyDb}. */
+ /** Dependent on state set by {@linkplain #copyDbAs}. */
private void createSPFBackup(boolean keepOriginal)
throws IOException {
PrivilegedFileOpsForTests.copy(spf, spfOld);