Merge pull request #184 from vietj/master

mauricio · mauricio · commit 38e112f6a6b0 · 2016-06-08T16:09:27.000-04:00
Upgrade to Netty 4.1.1.Final
diff --git a/mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/codec/LittleEndianByteBufAllocator.scala b/mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/codec/LittleEndianByteBufAllocator.scala
@@ -66,6 +66,8 @@ class LittleEndianByteBufAllocator extends ByteBufAllocator {
 
   def compositeDirectBuffer(maxNumComponents: Int): CompositeByteBuf = allocator.compositeDirectBuffer(maxNumComponents)
 
+  def calculateNewCapacity(minNewCapacity: Int, maxCapacity: Int): Int = allocator.calculateNewCapacity(minNewCapacity, maxCapacity)
+
   private def littleEndian(b: ByteBuf) = b.order(ByteOrder.LITTLE_ENDIAN)
 
 }
diff --git a/project/Build.scala b/project/Build.scala
@@ -62,7 +62,7 @@ object Configuration {
     "org.slf4j" % "slf4j-api" % "1.7.18",
     "joda-time" % "joda-time" % "2.9.2",
     "org.joda" % "joda-convert" % "1.8.1",
-    "io.netty" % "netty-all" % "4.0.34.Final",
+    "io.netty" % "netty-all" % "4.1.1.Final",
     "org.javassist" % "javassist" % "3.20.0-GA",
     specs2Dependency,
     specs2JunitDependency,

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ class LittleEndianByteBufAllocator extends ByteBufAllocator {`
`66`	`66`
`67`	`67`	`def compositeDirectBuffer(maxNumComponents: Int): CompositeByteBuf = allocator.compositeDirectBuffer(maxNumComponents)`
`68`	`68`
	`69`	`+ def calculateNewCapacity(minNewCapacity: Int, maxCapacity: Int): Int = allocator.calculateNewCapacity(minNewCapacity, maxCapacity)`
	`70`	`+`
`69`	`71`	`private def littleEndian(b: ByteBuf) = b.order(ByteOrder.LITTLE_ENDIAN)`
`70`	`72`
`71`	`73`	`}`