OW2 Consortium
Search OW2 Mail Archive: 

Advanced Search - Powered by Google


Mail Archive Home | gotm-commits List | November 2005 Index

<--  Date Index  --> <--  Thread Index  -->

CVS update of gotm/src/java/org/objectweb/gotm/lib (2 files)


    Date: Thursday, November 17, 2005 @ 18:13:36
  Author: rouvoy
    Path: /cvsroot/gotm/gotm/src/java/org/objectweb/gotm/lib

Modified: coordination/TransactionAbortedException.java
          logging/GenericLogger.java

* Correcting memory allocation bug in log buffers.


-----------------------------------------------+
 coordination/TransactionAbortedException.java |    8 ++++----
 logging/GenericLogger.java                    |   21 ++++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)


Index: 
gotm/src/java/org/objectweb/gotm/lib/coordination/TransactionAbortedException.java
diff -u 
gotm/src/java/org/objectweb/gotm/lib/coordination/TransactionAbortedException.java:1.1
 
gotm/src/java/org/objectweb/gotm/lib/coordination/TransactionAbortedException.java:1.2
--- 
gotm/src/java/org/objectweb/gotm/lib/coordination/TransactionAbortedException.java:1.1
      Thu Nov 17 14:04:22 2005
+++ 
gotm/src/java/org/objectweb/gotm/lib/coordination/TransactionAbortedException.java
  Thu Nov 17 18:13:35 2005
@@ -23,18 +23,18 @@
 Contributor(s): .
 
 ---------------------------------------------------------------------
-$Id: TransactionAbortedException.java,v 1.1 2005/11/17 13:04:22 rouvoy Exp $
+$Id: TransactionAbortedException.java,v 1.2 2005/11/17 17:13:35 rouvoy Exp $
 ====================================================================*/
 package org.objectweb.gotm.lib.coordination;
 
 /**
  * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
  * @created 17 nov. 2005
- * @modified $Date: 2005/11/17 13:04:22 $
- * @version $Revision: 1.1 $
+ * @modified $Date: 2005/11/17 17:13:35 $
+ * @version $Revision: 1.2 $
  * @fractal.itf 
  */
 public class TransactionAbortedException
         extends Exception {
-
+    // Nothing to declare
 }
Index: gotm/src/java/org/objectweb/gotm/lib/logging/GenericLogger.java
diff -u gotm/src/java/org/objectweb/gotm/lib/logging/GenericLogger.java:1.4 
gotm/src/java/org/objectweb/gotm/lib/logging/GenericLogger.java:1.5
--- gotm/src/java/org/objectweb/gotm/lib/logging/GenericLogger.java:1.4 Fri 
Oct 14 13:43:53 2005
+++ gotm/src/java/org/objectweb/gotm/lib/logging/GenericLogger.java     Thu 
Nov 17 18:13:36 2005
@@ -23,7 +23,7 @@
 Contributor(s): .
 
 ---------------------------------------------------------------------
-$Id: GenericLogger.java,v 1.4 2005/10/14 11:43:53 rouvoy Exp $
+$Id: GenericLogger.java,v 1.5 2005/11/17 17:13:36 rouvoy Exp $
 ====================================================================*/
 package org.objectweb.gotm.lib.logging;
 
@@ -37,8 +37,8 @@
 /**
  * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
  * @created 7 juil. 2005
- * @modified $Date: 2005/10/14 11:43:53 $
- * @version $Revision: 1.4 $
+ * @modified $Date: 2005/11/17 17:13:36 $
+ * @version $Revision: 1.5 $
  * @fractal.itf name="logger-provider" role="client" 
signature="org.objectweb.gotm.lib.logging.LoggerProvider"
  * @fractal.itf name="reference-provider" role="client" 
signature="org.objectweb.gotm.lib.reference.ReferenceProvider"
  */
@@ -96,11 +96,12 @@
     protected byte[][] compute(byte[][] data) {
         byte[][] ref = reference().convertToBytes();
         byte[][] result = new byte[ref.length + data.length][];
-        for (int i=0 ; i<result.length ; i++) {
-            result[i] = ref[i];
+        for (int i=0 ; i<ref.length ; i++) {
+            result[i] = new byte[ref[i].length];
+            System.arraycopy(result[i],0,ref[i],0,ref[i].length);
         }
         for (int i=ref.length ; i<result.length ; i++) {
-            result[i] = data[i-ref.length];
+            
System.arraycopy(result[i],0,data[i-ref.length],0,data[i-ref.length].length);
         }
         return result;
     }
@@ -123,10 +124,12 @@
     protected byte[][] compute(byte[] data) {
         byte[][] ref = reference().convertToBytes();
         byte[][] result = new byte[ref.length + 1][];
-        for (int i=0 ; i<result.length ; i++) {
-            result[i] = ref[i];
+        for (int i=0 ; i<ref.length ; i++) {
+            result[i] = new byte[ref[i].length];
+            System.arraycopy(result[i],0,ref[i],0,ref[i].length);
         }
-        result[ref.length] = data;
+        result[ref.length] = new byte[data.length];
+        System.arraycopy(result[ref.length],0,data,0,data.length);
         return result;
     }
 



<--  Date Index  --> <--  Thread Index  -->

Reply via email to:

Powered by MHonArc.

Copyright © 2006-2007, OW2 Consortium | contact | webmaster.