diff --git a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java index 63122eb82e..39836c53f5 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java @@ -566,7 +566,7 @@ public class SAMStreamSession { _log.debug("run() called for socket reader " + id); int read = -1; - ByteBuffer data = ByteBuffer.allocateDirect(SOCKET_HANDLER_BUF_SIZE); + ByteBuffer data = ByteBuffer.allocate(SOCKET_HANDLER_BUF_SIZE); try { InputStream in = i2pSocket.getInputStream(); diff --git a/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java index 76dc595f0b..3ea2b55c38 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java @@ -510,7 +510,7 @@ public class SAMv2StreamSession extends SAMStreamSession _log.debug ( "run() called for socket reader " + id ); int read = -1; - ByteBuffer data = ByteBuffer.allocateDirect(SOCKET_HANDLER_BUF_SIZE); + ByteBuffer data = ByteBuffer.allocate(SOCKET_HANDLER_BUF_SIZE); try { diff --git a/history.txt b/history.txt index e7c9cfdc0d..7d0e456c97 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,18 @@ +2012-08-09 zzz + * Datagrams: Remove static logs + * i2psnark: + - Remove static SnarkManager instance + - Allow DHT-only torrents + - DHT debugging + * NTCP: Stat cleanup + * SAM: + - Don't use direct byte buffers that may be leaking (ticket #679) + - Volatiles and finals + * SSU: + - Don't send a packet that exceeds the MTU + - Stub out local MTU detection (ticket #682) + - More cleanups + 2012-08-07 str4d * Console: - Theme updates from dr|z3d diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f6e6df3a5c..4e28a2c8d2 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 4; + public final static long BUILD = 5; /** for example "-test" */ public final static String EXTRA = "";