From f4ac21a3f20b60ef6cbcf322fbd72f225161a2dd Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Fri, 15 May 2015 17:28:27 +0200
Subject: [PATCH] Read data directly into a local array

Do not instantiate an implied ByteBuf -- just allocate it explicitly and
pass it on.

Change-Id: Ib76e03dbf154cd7525aa5cd3e75cb9d3c45cd727
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit a706f49c49d16bbb441c8d0a5c85950c28b6c246)
---
 .../factories/OF10PacketInMessageFactory.java              | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactory.java
index 3de0288b..b3819445 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactory.java
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
-
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason;
@@ -25,7 +24,7 @@ public class OF10PacketInMessageFactory implements OFDeserializer<PacketInMessag
     private static final byte PADDING_IN_PACKET_IN_HEADER = 1;
 
     @Override
-    public PacketInMessage deserialize(ByteBuf rawMessage) {
+    public PacketInMessage deserialize(final ByteBuf rawMessage) {
         PacketInMessageBuilder builder = new PacketInMessageBuilder();
         builder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
         builder.setXid(rawMessage.readUnsignedInt());
@@ -36,7 +35,9 @@ public class OF10PacketInMessageFactory implements OFDeserializer<PacketInMessag
         rawMessage.skipBytes(PADDING_IN_PACKET_IN_HEADER);
         int remainingBytes = rawMessage.readableBytes();
         if (remainingBytes > 0) {
-            builder.setData(rawMessage.readBytes(remainingBytes).array());
+            final byte[] buf = new byte[remainingBytes];
+            rawMessage.readBytes(buf);
+            builder.setData(buf);
         }
         return builder.build();
     }
-- 
2.36.6