merging in Floodlight changes

src/main/java/org/openflow/protocol/OFType.java

@@ -141,7 +141,7 @@ public enum OFType {
      * type number, length, and derived class
      *
      * @param type Wire protocol number associated with this OFType
-     * @param requestClass The Java class corresponding to this type of OpenFlow
+     * @param clazz The Java class corresponding to this type of OpenFlow
      *              message
      * @param instantiator An Instantiator<OFMessage> implementation that creates an
      *          instance of the specified OFMessage

src/main/java/org/openflow/protocol/action/OFActionDataLayer.java

@@ -22,6 +22,9 @@ package org.openflow.protocol.action;
 
 import java.util.Arrays;
 
+import net.floodlightcontroller.core.web.serializers.ByteArrayMACSerializer;
+
+import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.openflow.protocol.OFPhysicalPort;
 
@@ -37,6 +40,7 @@ public abstract class OFActionDataLayer extends OFAction {
     /**
      * @return the dataLayerAddress
      */
+    @JsonSerialize(using=ByteArrayMACSerializer.class)
     public byte[] getDataLayerAddress() {
         return dataLayerAddress;
     }