Skip to content

Commit 05d2e2e

Browse files
DavidiusdadiDavidiusdadi
committed
Merge pull request TooTallNate#260 from 6wunderkinder/master
* Fix stack overflow error
2 parents 7c3b223 + bc6cea4 commit 05d2e2e

5 files changed

Lines changed: 104 additions & 104 deletions

File tree

‎gradle/wrapper/gradle-wrapper.jar‎

5.87 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Feb 13 00:13:35 GMT 2013
1+
#Wed Jul 02 20:43:27 CEST 2014
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.4-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-1.4-bin.zip

‎gradlew‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 90 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/java/org/java_websocket/SSLSocketChannel2.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ protected void consumeDelegatedTasks() {
179179
}
180180

181181
protected void createBuffers( SSLSession session ) {
182-
int appBufferMax = session.getApplicationBufferSize();
183182
int netBufferMax = session.getPacketBufferSize();
183+
int appBufferMax = Math.max(session.getApplicationBufferSize(), netBufferMax);
184184

185185
if( inData == null ) {
186186
inData = ByteBuffer.allocate( appBufferMax );
@@ -209,9 +209,9 @@ public int write( ByteBuffer src ) throws IOException {
209209
return 0;
210210
}
211211
// assert ( bufferallocations > 1 ); //see #190
212-
if( bufferallocations <= 1 ) {
213-
createBuffers( sslEngine.getSession() );
214-
}
212+
//if( bufferallocations <= 1 ) {
213+
// createBuffers( sslEngine.getSession() );
214+
//}
215215
int num = socketChannel.write( wrap( src ) );
216216
return num;
217217

@@ -239,9 +239,9 @@ public int read( ByteBuffer dst ) throws IOException {
239239
}
240240
}
241241
// assert ( bufferallocations > 1 ); //see #190
242-
if( bufferallocations <= 1 ) {
243-
createBuffers( sslEngine.getSession() );
244-
}
242+
//if( bufferallocations <= 1 ) {
243+
// createBuffers( sslEngine.getSession() );
244+
//}
245245
/* 1. When "dst" is smaller than "inData" readRemaining will fill "dst" with data decoded in a previous read call.
246246
* 2. When "inCrypt" contains more data than "inData" has remaining space, unwrap has to be called on more time(readRemaining)
247247
*/

0 commit comments

Comments
 (0)