Merge branch 'master' of github.com:SonarSource/sonar

2 files changed, 4 insertions, 4 deletions

diff --git a/sonar-channel/src/main/java/org/sonar/channel/ChannelDispatcher.java b/sonar-channel/src/main/java/org/sonar/channel/ChannelDispatcher.java
index d772d81ffd5..dcbd5c56a74 100644
--- a/sonar-channel/src/main/java/org/sonar/channel/ChannelDispatcher.java
+++ b/sonar-channel/src/main/java/org/sonar/channel/ChannelDispatcher.java
@@ -46,7 +46,7 @@ public class ChannelDispatcher<OUTPUT> extends Channel<OUTPUT> {
 
   @SuppressWarnings("rawtypes")
   public ChannelDispatcher(List<Channel> channels, boolean failIfNoChannelToConsumeOneCharacter) {
-    this.channels = channels.toArray(new Channel[0]); // NOSONAR, lack of performance is not an issue here
+    this.channels = channels.toArray(new Channel[channels.size()]);
     this.failIfNoChannelToConsumeOneCharacter = failIfNoChannelToConsumeOneCharacter;
   }
 
diff --git a/sonar-channel/src/main/java/org/sonar/channel/CodeBuffer.java b/sonar-channel/src/main/java/org/sonar/channel/CodeBuffer.java
index 25ad180b4b3..2358e0bfa44 100644
--- a/sonar-channel/src/main/java/org/sonar/channel/CodeBuffer.java
+++ b/sonar-channel/src/main/java/org/sonar/channel/CodeBuffer.java
@@ -258,9 +258,9 @@ public class CodeBuffer implements CharSequence {
   public final String toString() {
     StringBuilder result = new StringBuilder();
     result.append("CodeReader(");
-    result.append("line:" + cursor.line);
-    result.append("|column:" + cursor.column);
-    result.append("|cursor value:'" + (char) peek() + "'");
+    result.append("line:").append(cursor.line);
+    result.append("|column:").append(cursor.column);
+    result.append("|cursor value:'").append((char) peek()).append("'");
     result.append(")");
     return result.toString();
   }