You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2006/11/20 04:26:32 UTC
svn commit: r477019 - in /mina/trunk:
core/src/main/java/org/apache/mina/common/ByteBuffer.java
core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java
java5/ pom.xml
Author: trustin
Date: Sun Nov 19 19:26:31 2006
New Revision: 477019
URL: http://svn.apache.org/viewvc?view=rev&rev=477019
Log:
* removed Java 5 module
* Changed the default allocator to SimpleByteBufferAllocator
* Removed unnecessary synchronization and check code in SimleByteBufferAllocator
Removed:
mina/trunk/java5/
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java
mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java
mina/trunk/pom.xml
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java?view=diff&rev=477019&r1=477018&r2=477019
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java Sun Nov 19 19:26:31 2006
@@ -158,7 +158,7 @@
*/
public abstract class ByteBuffer implements Comparable
{
- private static ByteBufferAllocator allocator = new PooledByteBufferAllocator();
+ private static ByteBufferAllocator allocator = new SimpleByteBufferAllocator();
private static boolean preferDirectBuffers = false;
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java?view=diff&rev=477019&r1=477018&r2=477019
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java Sun Nov 19 19:26:31 2006
@@ -64,42 +64,19 @@
private static class SimpleByteBuffer extends BaseByteBuffer
{
private java.nio.ByteBuffer buf;
- private int refCount = 1;
protected SimpleByteBuffer( java.nio.ByteBuffer buf )
{
this.buf = buf;
buf.order( ByteOrder.BIG_ENDIAN );
- refCount = 1;
}
- public synchronized void acquire()
+ public void acquire()
{
- if( refCount <= 0 )
- {
- throw new IllegalStateException( "Already released buffer." );
- }
-
- refCount ++;
}
public void release()
{
- synchronized( this )
- {
- if( refCount <= 0 )
- {
- refCount = 0;
- throw new IllegalStateException(
- "Already released buffer. You released the buffer too many times." );
- }
-
- refCount --;
- if( refCount > 0)
- {
- return;
- }
- }
}
public java.nio.ByteBuffer buf()
Modified: mina/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/pom.xml?view=diff&rev=477019&r1=477018&r2=477019
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Sun Nov 19 19:26:31 2006
@@ -67,7 +67,6 @@
<modules>
<module>core</module>
- <module>java5</module>
<module>filter-ssl</module>
<module>filter-codec-netty</module>
<module>filter-compression</module>