Skip to content

2.1.x #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kc7bfi wants to merge 6 commits into
base: 2.1.X
Choose a base branch
from
Open

2.1.x #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8385ae
Origional patch
kc7bfi Feb 11, 2020
eb7bcc2
Free buffers when done with them
kc7bfi Feb 11, 2020
a2ac676
Parent priject
kc7bfi Feb 12, 2020
221d189
PSG version
kc7bfi Feb 13, 2020
12ad6e0
Set version back to SNAPSHOT
kc7bfi Sep 24, 2020
a03a3c1
SNAPSHOT to PSG
kc7bfi Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>mina-parent</artifactId>
<groupId>org.apache.mina</groupId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>distribution</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-core</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/
package org.apache.mina.core.filterchain;

import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.filterchain.IoFilter.NextFilter;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoEvent;
Expand Down Expand Up @@ -104,6 +105,7 @@ public void fire() {
case MESSAGE_RECEIVED:
Object parameter = getParameter();
nextFilter.messageReceived(session, parameter);
if (parameter instanceof IoBuffer) ((IoBuffer)parameter).free();
break;

case MESSAGE_SENT:
Expand Down
3 changes: 3 additions & 0 deletions mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,12 +537,15 @@ private void read(S session) {
if (readBytes > 0) {
IoFilterChain filterChain = session.getFilterChain();
filterChain.fireMessageReceived(buf);
buf.free();
buf = null;

if (hasFragmentation) {
if (readBytes << 1 < config.getReadBufferSize()) {
if (LOG.isDebugEnabled()) LOG.debug("Decrease read buffer size: current: " + config.getReadBufferSize());
session.decreaseReadBufferSize();
} else if (readBytes == config.getReadBufferSize()) {
if (LOG.isDebugEnabled()) LOG.debug("Increase read buffer size: current: " + config.getReadBufferSize());
session.increaseReadBufferSize();
}
}
Expand Down
3 changes: 2 additions & 1 deletion mina-core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void write(Object encodedMessage) {
if (encodedMessage instanceof IoBuffer) {
IoBuffer buf = (IoBuffer) encodedMessage;
if (buf.hasRemaining()) {
messageQueue.offer(buf);
messageQueue.offer(buf.duplicate());
} else {
throw new IllegalArgumentException("buf is empty. Forgot to call flip()?");
}
Expand Down Expand Up @@ -100,6 +100,7 @@ public void mergeAll() {
}

newBuf.put(buf);
buf.free();
}

// Push the new buffer finally.
Expand Down
10 changes: 8 additions & 2 deletions mina-core/src/main/java/org/apache/mina/filter/codec/CumulativeProtocolDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,12 @@ public void decode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) th
newBuf.put(buf);
newBuf.put(in);
newBuf.flip();
buf.free();
buf = newBuf;

// Update the session attribute.
//IoBuffer oldBuf = (IoBuffer) session.getAttribute(BUFFER);
//if (oldBuf != null) oldBuf.free();
session.setAttribute(BUFFER, buf);
}
} else {
Expand Down Expand Up @@ -234,15 +237,18 @@ public void dispose(IoSession session) throws Exception {
}

private void removeSessionBuffer(IoSession session) {
session.removeAttribute(BUFFER);
}
IoBuffer oldBuf = (IoBuffer) session.removeAttribute(BUFFER);
if (oldBuf != null) oldBuf.free();
}

private void storeRemainingInSession(IoBuffer buf, IoSession session) {
final IoBuffer remainingBuf = IoBuffer.allocate(buf.capacity()).setAutoExpand(true);

remainingBuf.order(buf.order());
remainingBuf.put(buf);

IoBuffer oldBuf = (IoBuffer) session.removeAttribute(BUFFER);
if (oldBuf != null) oldBuf.free();
session.setAttribute(BUFFER, remainingBuf);
}

Expand Down
1 change: 1 addition & 0 deletions mina-core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ public void messageReceived(NextFilter nextFilter, IoSession session, Object mes
}
}
}
//in.free();
}

/**
Expand Down
10 changes: 8 additions & 2 deletions mina-core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;

import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.filterchain.IoFilterAdapter;
import org.apache.mina.core.filterchain.IoFilterChain;
import org.apache.mina.core.filterchain.IoFilterEvent;
Expand Down Expand Up @@ -563,8 +564,13 @@ public final void exceptionCaught(NextFilter nextFilter, IoSession session, Thro
@Override
public final void messageReceived(NextFilter nextFilter, IoSession session, Object message) {
if (eventTypes.contains(IoEventType.MESSAGE_RECEIVED)) {
IoFilterEvent event = new IoFilterEvent(nextFilter, IoEventType.MESSAGE_RECEIVED, session, message);
fireEvent(event);
if (message instanceof IoBuffer) {
IoFilterEvent event = new IoFilterEvent(nextFilter, IoEventType.MESSAGE_RECEIVED, session, ((IoBuffer)message).duplicate());
fireEvent(event);
} else {
IoFilterEvent event = new IoFilterEvent(nextFilter, IoEventType.MESSAGE_RECEIVED, session, message);
fireEvent(event);
}
} else {
nextFilter.messageReceived(session, message);
}
Expand Down
2 changes: 1 addition & 1 deletion mina-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-example</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina-filter-compression/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-filter-compression</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina-integration-beans/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-integration-beans</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina-integration-jmx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-integration-jmx</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina-integration-ognl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-integration-ognl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina-integration-xbean/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-integration-xbean</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina-legal/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-legal</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina-statemachine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-statemachine</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina-transport-apr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-transport-apr</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina-transport-serial/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
</parent>

<artifactId>mina-transport-serial</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</organization>

<groupId>org.apache.mina</groupId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4-PSG</version>
<artifactId>mina-parent</artifactId>
<name>Apache MINA</name>
<packaging>pom</packaging>
Expand Down