wcrisman/Brainstorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix. I think this fixed a long standing bug in the brainstorm web server.

Browse Source
This commit is contained in:
Wynne Crisman
2016-08-17 17:56:41 -07:00
parent 040a3b4ddc
commit dd48e2fe24
5 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Foundation Web Core/src/com/foundation/web/server/AbstractSocketContext.java
View File

@@ -95,6 +95,14 @@ protected abstract void passThrough(ByteBuffer buffer);
* Closes the socket context and cleans up.
*/
protected abstract void close();
/**
* Determines whether the socket context has been closed.
* Should synchronize on getLock() prior to calling this.
* @return Whether the socket context is closed.
*/
protected boolean isClosed() {
return !(key != null && key.channel().isOpen());
}//isClosed()//
/**
* Gets the socket context related to this one (when two are tied together such that data from one immediately is sent to the other).
* @return The related socket context, or null if none exists (data not forwarded to a remote server).

6
Foundation Web Core/src/com/foundation/web/server/PassThroughSocketContext.java
View File

@@ -249,4 +249,10 @@ protected synchronized void close() {
protected boolean hasPendingWrite() {
return currentOutboundMessage != null;
}//hasPendingWrite()//
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
public String toString() {
return "PassThroughSocketContext: " + (relatedSocketContext != null ? relatedSocketContext.toString() : "null");
}//toString()//
}//PassThroughSocketContext//

52
Foundation Web Core/src/com/foundation/web/server/SocketContext.java
View File

@@ -325,33 +325,39 @@ protected void writeOutgoingMessages() throws IOException {
//Synchronized to avoid multiple threads accessing the currentOutboundMessage chain at one time.//
synchronized(getLock()) {
if(currentOutboundMessage != outboundMessage) {
Debug.log(new RuntimeException("Cannot change the currentOutboundMessage while we are sending it!"));
}//if//
//If we finished the message then load the next message, otherwise flag that we need to stop sending (buffers full - flag a write on the socket's key and wait).//
if(messageSent || (currentOutboundMessage != null && currentOutboundMessage.isClosed())) {
if(getWebServer().debug()) {
Debug.log(this.getId() + "|" + System.nanoTime() + "|The sent message was fully sent.");
if(!isClosed()) {
if(currentOutboundMessage != outboundMessage) {
Debug.log(new RuntimeException("Cannot change the currentOutboundMessage while we are sending it! {" + toString() + "}"));
}//if//
//Close the message if possible.//
try {currentOutboundMessage.close();} catch(Throwable e) {}
//Load the next available message.//
currentOutboundMessage = currentOutboundMessage.getNext();
if(currentOutboundMessage == null) lastOutboundMessage = null;
keepSending = hasPendingWrite() && key.channel().isOpen();
outboundMessage = currentOutboundMessage;
if(getWebServer().debug()) {
Debug.log(this.getId() + "|" + System.nanoTime() + "| Channel is open? " + key.channel().isOpen() + "; More message available? " + hasPendingWrite() + "; EncryptedWriteBuffer.remaining? " + encryptedWriteBuffer.remaining() + ".");
//If we finished the message then load the next message, otherwise flag that we need to stop sending (buffers full - flag a write on the socket's key and wait).//
if(messageSent || (currentOutboundMessage != null && currentOutboundMessage.isClosed())) {
if(getWebServer().debug()) {
Debug.log(this.getId() + "|" + System.nanoTime() + "|The sent message was fully sent.");
}//if//
//Close the message if possible.//
try {currentOutboundMessage.close();} catch(Throwable e) {}
//Load the next available message.//
currentOutboundMessage = currentOutboundMessage.getNext();
if(currentOutboundMessage == null) lastOutboundMessage = null;
keepSending = hasPendingWrite() && key.channel().isOpen();
outboundMessage = currentOutboundMessage;
if(getWebServer().debug()) {
Debug.log(this.getId() + "|" + System.nanoTime() + "| Channel is open? " + key.channel().isOpen() + "; More message available? " + hasPendingWrite() + "; EncryptedWriteBuffer.remaining? " + encryptedWriteBuffer.remaining() + ".");
}//if//
}//if//
else {
if(getWebServer().debug()) {
Debug.log(this.getId() + "|" + System.nanoTime() + "|The sent message was only partially sent, stop sending for now.");
}//if//
keepSending = false;
}//else//
}//if//
else {
if(getWebServer().debug()) {
Debug.log(this.getId() + "|" + System.nanoTime() + "|The sent message was only partially sent, stop sending for now.");
}//if//
Debug.log(this.getId() + "|" + System.nanoTime() + "|Socket closed.");
keepSending = false;
}//else//
}//synchronized//
@@ -2245,6 +2251,6 @@ private int indexOf(byte[] source, byte[] pattern, int fromOffset) {
* @see java.lang.Object#toString()
*/
public String toString() {
return "Domain: " + domain + "; SSL: " + (sslEngine != null) + "; Websocket: " + isWebsocket;
return "SocketContext: Domain: " + domain + "; SSL: " + (sslEngine != null) + "; Websocket: " + isWebsocket;
}//toString()//
}//SocketContext//