Made Draft_75 only deliver complete frames and no incomplete frame fragments. (TooTallNate#144)

These changes also fix the NullPointerException in TooTallNate#178

Author: Davidiusdadi

src/main/java/org/java_websocket/drafts/Draft_75.java

@@ -7,7 +7,9 @@
 importjava.util.Random;
 
 importorg.java_websocket.exceptions.InvalidDataException;
+importorg.java_websocket.exceptions.InvalidFrameException;
 importorg.java_websocket.exceptions.InvalidHandshakeException;
+importorg.java_websocket.exceptions.LimitExedeedException;
 importorg.java_websocket.exceptions.NotSendableException;
 importorg.java_websocket.framing.CloseFrame;
 importorg.java_websocket.framing.FrameBuilder;
@@ -40,14 +42,13 @@ public class Draft_75 extends Draft{
  */
 publicstaticfinalbyteEND_OF_FRAME = (byte) 0xFF;
 
+/** Is only used to detect protocol violations */
 protectedbooleanreadingState = false;
-privatebooleaninframe = false;
+
 protectedList<Framedata> readyframes = newLinkedList<Framedata>();
 protectedByteBuffercurrentFrame;
-
-
+
 privatefinalRandomreuseableRandom = newRandom();
-
 
 @Override
 publicHandshakeStateacceptHandshakeAsClient( ClientHandshakerequest, ServerHandshakeresponse ){
@@ -122,29 +123,29 @@ public HandshakeBuilder postProcessHandshakeResponseAsServer( ClientHandshake re
  }
 
 protectedList<Framedata> translateRegularFrame( ByteBufferbuffer ) throwsInvalidDataException{
+
 while ( buffer.hasRemaining() ){
 bytenewestByte = buffer.get();
 if( newestByte == START_OF_FRAME ){// Beginning of Frame
 if( readingState )
-returnnull;
+thrownewInvalidFrameException( "unexpected START_OF_FRAME" );
 readingState = true;
  } elseif( newestByte == END_OF_FRAME ){// End of Frame
 if( !readingState )
-returnnull;
+thrownewInvalidFrameException( "unexpected END_OF_FRAME" );
 // currentFrame will be null if END_OF_FRAME was send directly after
 // START_OF_FRAME, thus we will send 'null' as the sent message.
 if( this.currentFrame != null ){
 currentFrame.flip();
 FramedataImpl1curframe = newFramedataImpl1();
 curframe.setPayload( currentFrame );
 curframe.setFin( true );
-curframe.setOptcode( inframe ? Opcode.CONTINUOUS : Opcode.TEXT );
+curframe.setOptcode( Opcode.TEXT );
 readyframes.add( curframe );
 this.currentFrame = null;
 buffer.mark();
  }
 readingState = false;
-inframe = false;
  } elseif( readingState ){// Regular frame data, add to current frame buffer //TODO This code is very expensive and slow
 if( currentFrame == null ){
 currentFrame = createBuffer();
@@ -156,15 +157,11 @@ protected List<Framedata> translateRegularFrame( ByteBuffer buffer ) throws Inva
 returnnull;
  }
  }
-if( readingState ){
-FramedataImpl1curframe = newFramedataImpl1();
-currentFrame.flip();
-curframe.setPayload( currentFrame );
-curframe.setFin( false );
-curframe.setOptcode( inframe ? Opcode.CONTINUOUS : Opcode.TEXT );
-inframe = true;
-readyframes.add( curframe );
- }
+
+// if no error occurred this block will be reached
+/*if( readingState ){
+ checkAlloc(currentFrame.position()+1);
+ }*/
 
 List<Framedata> frames = readyframes;
 readyframes = newLinkedList<Framedata>();
@@ -196,9 +193,9 @@ public ByteBuffer createBuffer(){
 returnByteBuffer.allocate( INITIAL_FAMESIZE );
  }
 
-publicByteBufferincreaseBuffer( ByteBufferfull ){
+publicByteBufferincreaseBuffer( ByteBufferfull ) throwsLimitExedeedException , InvalidDataException{
 full.flip();
-ByteBuffernewbuffer = ByteBuffer.allocate( full.capacity() * 2 );
+ByteBuffernewbuffer = ByteBuffer.allocate( checkAlloc( full.capacity() * 2 ) );
 newbuffer.put( full );
 returnnewbuffer;
  }