Changeset 39:b33c938a185a in rrlib_serialization-java


Ignore:
Timestamp:
10.08.2018 10:37:32 (11 months ago)
Author:
Max Reichardt <max.reichardt@…>
Branch:
default
Parents:
32:a2a665078e49 (diff), 38:4b14333dc42e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge with 17.03

Files:
2 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • MemoryBuffer.java

    r32 r39  
    4141 * Writing and reading concurrently is not supported - due to resize. 
    4242 */ 
    43 public class MemoryBuffer implements BinarySerializable, ConstSource, Sink, Copyable<MemoryBuffer>, GenericChangeable<MemoryBuffer>, ArrayBuffer { 
     43public class MemoryBuffer implements BinarySerializable, Source, Sink, Copyable<MemoryBuffer>, GenericChangeable<MemoryBuffer>, ArrayBuffer { 
    4444 
    4545    /** Size of temporary array */ 
     
    7676 
    7777    public MemoryBuffer(int size) { 
    78         this(size, DEFAULT_RESIZE_FACTOR, true); 
     78        this(size, DEFAULT_RESIZE_FACTOR, false); 
    7979    } 
    8080 
     
    8282     * @param size Initial buffer size 
    8383     * @param resizeFactor When buffer needs to be reallocated, new size is multiplied with this factor to have some bytes in reserve 
    84      * @param allocatDirect Allocate direct byte buffer? (in heap outside of JVM - mainly relevant for JNI code) 
    85      */ 
    86     public MemoryBuffer(int size, float resizeFactor, boolean allocatDirect) { 
    87         backend = new FixedBuffer(size, allocatDirect); 
     84     * @param allocateDirect Allocate direct byte buffer? (in heap outside of JVM - mainly relevant for JNI code) 
     85     */ 
     86    public MemoryBuffer(int size, float resizeFactor, boolean allocateDirect) { 
     87        backend = new FixedBuffer(size, allocateDirect); 
    8888        resizeReserveFactor = resizeFactor; 
    8989    } 
Note: See TracChangeset for help on using the changeset viewer.