Fix v1.2.2.5

RegioneER · Jul 14, 2022 · d506dc2 · d506dc2
1 parent a869668
commit d506dc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/META-INF/ra.xml b/src/META-INF/ra.xml
@@ -98,7 +98,7 @@ This source code is being made available to the public under the terms specified
         <config-property>
             <config-property-name>transactionTimeout</config-property-name>
             <config-property-type>java.lang.Integer</config-property-type>
-            <config-property-value>60</config-property-value>
+            <config-property-value>0</config-property-value>
         </config-property>
         <config-property>
             <config-property-name>enableRemoteInvocations</config-property-name>

diff --git a/src/org/xadisk/filesystem/workers/GatheringDiskWriter.java b/src/org/xadisk/filesystem/workers/GatheringDiskWriter.java
@@ -198,6 +198,7 @@ private void addInMemoryBufferToTransaction(TransactionInformation xid, Buffer b
 
     public void submitBuffer(Buffer logEntry, TransactionInformation xid) {
         logEntry.flushByteBufferChanges();
+        int bufferSizeToAdd = logEntry.getBuffer().remaining();
         ConcurrentLinkedQueue<Buffer> txnBuffers = transactionSubmittedBuffers.get(xid);
         if (txnBuffers == null) {
             txnBuffers = new ConcurrentLinkedQueue<Buffer>();
@@ -206,7 +207,7 @@ public void submitBuffer(Buffer logEntry, TransactionInformation xid) {
         } else {
             txnBuffers.add(logEntry);
         }
-        int currentCumulativeSize = cumulativeBufferSize.addAndGet(logEntry.getBuffer().remaining());
+        int currentCumulativeSize = cumulativeBufferSize.addAndGet(bufferSizeToAdd);
         raiseEventThreadSafely(currentCumulativeSize);
     }