Merge into master from pull request #24:

log msg cleanup (https://github.com/floodlight/floodlight/pull/24)

src/main/java/net/floodlightcontroller/core/internal/Controller.java

@@ -785,16 +785,6 @@ public class Controller
                                 eth);
                     }
                     
-                    // Print the packet-in for debugging purposes at this point
-                    // The context would have the necessary information for
-                    // the OFMessageFilterManager's getDataToString to work
-                    // for packet-ins.
-                    if (log.isDebugEnabled()) {
-                        String str = messageFilterManager.getDataAsString(sw, m, bc);
-                        log.trace("{}", str);
-                    }
-
-
                     // Get the starting time (overall and per-component) of 
                     // the processing chain for this packet if performance
                     // monitoring is turned on

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

@@ -21,6 +21,7 @@ import java.util.Arrays;
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.openflow.util.U16;
+import org.openflow.util.U32;
 import org.openflow.util.U8;
 
 /**
@@ -201,4 +202,10 @@ public class OFPacketIn extends OFMessage {
         }
         return true;
     }
+
+    public String toString() {
+        String myStr = super.toString();
+        return "packetIn" +
+            ":bufferId=" + U32.f(this.bufferId) + myStr;
+    }
 }