fixing a test issue

2012-07-06 15:56:04 -05:00 · 2012-07-06 15:56:04 -05:00 · fc8198e854
parent c7cff443be
commit fc8198e854
1 changed files with 5 additions and 2 deletions
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/FrameGenerator.java
+++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/FrameGenerator.java
@ -165,9 +165,12 @@ public class FrameGenerator
            // validate the close
            new CloseInfo(frame.getPayloadData(),true);
        }
-        // copy payload
-        buffer.put(frame.getPayloadData());

+        // copy payload
+        if (frame.hasPayload())
+        {
+            buffer.put(frame.getPayloadData());
+        }
        int positionPostPayload = buffer.position();

        // mask it if needed