db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1058346 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/services/jce/ testing/org/apache/derbyTesting/functionTests/util/corruptio/ testing/org/apache/derbyTesting/unitTests/store/
Date Wed, 12 Jan 2011 22:59:59 GMT
Author: dag
Date: Wed Jan 12 22:59:58 2011
New Revision: 1058346

URL: http://svn.apache.org/viewvc?rev=1058346&view=rev
Log:
DERBY-4963 Revert to FileDescriptor#sync from FileChannel#force to improve interrupt resilience

Follow-up: white-space changes only.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptRandomAccessFile.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java?rev=1058346&r1=1058345&r2=1058346&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
Wed Jan 12 22:59:58 2011
@@ -899,7 +899,7 @@ public final class JCECipherFactory impl
 				verifyKeyFile.writeInt(checksum.length);
 				verifyKeyFile.write(checksum);
 				verifyKeyFile.write(data);
-				verifyKeyFile.sync();
+                verifyKeyFile.sync();
 			}
 			else
 			{

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptRandomAccessFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptRandomAccessFile.java?rev=1058346&r1=1058345&r2=1058346&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptRandomAccessFile.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptRandomAccessFile.java
Wed Jan 12 22:59:58 2011
@@ -103,7 +103,7 @@ public class CorruptRandomAccessFile imp
      */
     public void sync() throws IOException
 	{
-		realRaf.sync();
+        realRaf.sync();
 	}
 
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java?rev=1058346&r1=1058345&r2=1058346&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java
Wed Jan 12 22:59:58 2011
@@ -1818,7 +1818,7 @@ public class T_RecoverBadLog extends T_G
 				filepos +=512;
 
 			}
-			log.sync();
+            log.sync();
 			log.close();
 		}catch(IOException ie)
 		{



Mime
View raw message