From 018f1c92d51d8f189e3d48ed602128be8d73d107 Mon Sep 17 00:00:00 2001
From: Oliver Schulz <oliver.schulz@tu-dortmund.de>
Date: Thu, 17 May 2012 22:34:50 +0200
Subject: [PATCH] Improved implementations of ByteString.++

---
 .../src/main/scala/akka/util/ByteString.scala | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/util/ByteString.scala b/akka-actor/src/main/scala/akka/util/ByteString.scala
index e070d294a6..091a0d728a 100644
--- a/akka-actor/src/main/scala/akka/util/ByteString.scala
+++ b/akka-actor/src/main/scala/akka/util/ByteString.scala
@@ -85,7 +85,9 @@ object ByteString {
     def decodeString(charset: String): String = new String(bytes, charset)
 
     def ++(that: ByteString): ByteString =
-      if (!that.isEmpty) toByteString1 ++ that else this
+      if (that.isEmpty) this
+      else if (this.isEmpty) that
+      else toByteString1 ++ that
 
     override def slice(from: Int, until: Int): ByteString =
       if ((from != 0) || (until != length)) toByteString1.slice(from, until)
@@ -129,14 +131,18 @@ object ByteString {
     def decodeString(charset: String): String =
       new String(if (length == bytes.length) bytes else toArray, charset)
 
-    def ++(that: ByteString): ByteString = that match {
-      case b: ByteString1C ⇒ ByteStrings(this, b.toByteString1)
-      case b: ByteString1 ⇒ {
-        if ((bytes eq b.bytes) && (startIndex + length == b.startIndex))
-          new ByteString1(bytes, startIndex, length + b.length)
-        else ByteStrings(this, b)
+    def ++(that: ByteString): ByteString = {
+      if (that.isEmpty) this
+      else if (this.isEmpty) that
+      else that match {
+        case b: ByteString1C ⇒ ByteStrings(this, b.toByteString1)
+        case b: ByteString1 ⇒ {
+          if ((bytes eq b.bytes) && (startIndex + length == b.startIndex))
+            new ByteString1(bytes, startIndex, length + b.length)
+          else ByteStrings(this, b)
+        }
+        case bs: ByteStrings ⇒ ByteStrings(this, bs)
       }
-      case bs: ByteStrings ⇒ ByteStrings(this, bs)
     }
   }
 
@@ -199,10 +205,14 @@ object ByteString {
 
     override def iterator = MultiByteArrayIterator(bytestrings.toList.map { _.iterator })
 
-    def ++(that: ByteString): ByteString = that match {
-      case b: ByteString1C ⇒ ByteStrings(this, b.toByteString1)
-      case b: ByteString1  ⇒ ByteStrings(this, b)
-      case bs: ByteStrings ⇒ ByteStrings(this, bs)
+    def ++(that: ByteString): ByteString = {
+      if (that.isEmpty) this
+      else if (this.isEmpty) that
+      else that match {
+        case b: ByteString1C ⇒ ByteStrings(this, b.toByteString1)
+        case b: ByteString1  ⇒ ByteStrings(this, b)
+        case bs: ByteStrings ⇒ ByteStrings(this, bs)
+      }
     }
 
     def contiguous = compact