Fixed issue: NETTY-162 directBuffer cannot create buffer with LITTLE_ENDIAN endianness

* Added test case for little endian direct buffer
* Fixed a problem where the sliced buffer's endianness is not set
This commit is contained in:
Trustin Lee 2009-05-30 06:50:09 +00:00
parent d4c2b7d70d
commit ffe2831502
3 changed files with 59 additions and 3 deletions

View File

@ -57,7 +57,7 @@ public class ByteBufferBackedChannelBuffer extends AbstractChannelBuffer {
throw new NullPointerException("buffer"); throw new NullPointerException("buffer");
} }
this.buffer = buffer.slice(); this.buffer = buffer.slice().order(buffer.order());
capacity = buffer.remaining(); capacity = buffer.remaining();
writerIndex(capacity); writerIndex(capacity);
} }
@ -337,6 +337,7 @@ public class ByteBufferBackedChannelBuffer extends AbstractChannelBuffer {
ByteBuffer dst = buffer.isDirect() ? ByteBuffer.allocateDirect(length) : ByteBuffer.allocate(length); ByteBuffer dst = buffer.isDirect() ? ByteBuffer.allocateDirect(length) : ByteBuffer.allocate(length);
dst.put(src); dst.put(src);
dst.order(order());
dst.clear(); dst.clear();
return new ByteBufferBackedChannelBuffer(dst); return new ByteBufferBackedChannelBuffer(dst);
} }

View File

@ -24,6 +24,8 @@ package org.jboss.netty.buffer;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.nio.ByteOrder;
/** /**
* *
* @author The Netty Project (netty-dev@lists.jboss.org) * @author The Netty Project (netty-dev@lists.jboss.org)
@ -31,13 +33,14 @@ import static org.junit.Assert.*;
* *
* @version $Rev$, $Date$ * @version $Rev$, $Date$
*/ */
public class DirectChannelBufferTest extends AbstractChannelBufferTest { public class BigEndianDirectChannelBufferTest extends AbstractChannelBufferTest {
private ChannelBuffer buffer; private ChannelBuffer buffer;
@Override @Override
protected ChannelBuffer newBuffer(int length) { protected ChannelBuffer newBuffer(int length) {
buffer = ChannelBuffers.directBuffer(length); buffer = ChannelBuffers.directBuffer(ByteOrder.BIG_ENDIAN, length);
assertSame(ByteOrder.BIG_ENDIAN, buffer.order());
assertEquals(0, buffer.writerIndex()); assertEquals(0, buffer.writerIndex());
return buffer; return buffer;
} }

View File

@ -0,0 +1,52 @@
/*
* JBoss, Home of Professional Open Source
*
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @author tags. See the COPYRIGHT.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.netty.buffer;
import static org.junit.Assert.*;
import java.nio.ByteOrder;
/**
*
* @author The Netty Project (netty-dev@lists.jboss.org)
* @author Trustin Lee (tlee@redhat.com)
*
* @version $Rev$, $Date$
*/
public class LittleEndianDirectChannelBufferTest extends AbstractChannelBufferTest {
private ChannelBuffer buffer;
@Override
protected ChannelBuffer newBuffer(int length) {
buffer = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, length);
assertSame(ByteOrder.LITTLE_ENDIAN, buffer.order());
assertEquals(0, buffer.writerIndex());
return buffer;
}
@Override
protected ChannelBuffer[] components() {
return new ChannelBuffer[] { buffer };
}
}