svn commit: r1227843 - in /incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory: MemoryManagerService.java MemoryManagerServiceImpl.java OffHeapMemoryBuffer.java

[bp...@apache.org]

Author: bperroud
Date: Thu Jan  5 21:21:31 2012
New Revision: 1227843

URL: http://svn.apache.org/viewvc?rev=1227843&view=rev
Log:
DIRECTMEMORY-42 : OffHeapMemoryBuffer store, allocate and free function's parameters consistency

Modified:
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
    incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java

Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java?rev=1227843&r1=1227842&r2=1227843&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerService.java Thu Jan  5 21:21:31 2012
@@ -50,6 +50,6 @@ public interface MemoryManagerService
 
     OffHeapMemoryBuffer getActiveBuffer();
 
-    Pointer allocate( int size, int expiresIn, int expires );
+    Pointer allocate( int size, long expiresIn, long expires );
 
 }

Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java?rev=1227843&r1=1227842&r2=1227843&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java Thu Jan  5 21:21:31 2012
@@ -163,7 +163,7 @@ public class MemoryManagerServiceImpl
     }
 
     @Override
-    public Pointer allocate( int size, int expiresIn, int expires )
+    public Pointer allocate( int size, long expiresIn, long expires )
     {
         Pointer p = activeBuffer.allocate( size, expiresIn, expires );
         if ( p == null )

Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java?rev=1227843&r1=1227842&r2=1227843&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBuffer.java Thu Jan  5 21:21:31 2012
@@ -149,7 +149,7 @@ public class OffHeapMemoryBuffer
     }
 
 
-    public long free( Pointer pointer2free )
+    public int free( Pointer pointer2free )
     {
         pointer2free.free = true;
         pointer2free.created = 0;
@@ -347,7 +347,7 @@ public class OffHeapMemoryBuffer
         return store( payload );
     }
 
-    public Pointer allocate( int size, int expiresIn, int expires )
+    public Pointer allocate( int size, long expiresIn, long expires )
     {
         Pointer goodOne = firstMatch( size );