Skip to content
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

FISH-464 Race conditions and stability #26

Merged
merged 9 commits into from
Jan 26, 2021
Merged

FISH-464 Race conditions and stability #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d1cb053
FISH-464 Changed version number to 2.4.4.payara-p5-SNAPSHOT
dmatej Nov 19, 2020
ff9fb25
FISH-464 Using different port in tests
dmatej Nov 19, 2020
71506c2
FISH-464 Fixed TrailersTest
dmatej Nov 19, 2020
8cffcc9
FISH-464 CloseReason has toString now
dmatej Nov 19, 2020
fdee87e
FISH-464 Minor syntax changes
dmatej Nov 19, 2020
ea142e0
FISH-464 Fixed NPE on missing CloseReason
dmatej Nov 19, 2020
a8556ff
FISH-464 Fixed IllegalStateException
dmatej Nov 19, 2020
15ee5e8
FISH-464 Escape both while loops if the record is null
dmatej Nov 19, 2020
e55a8db
FISH-464 Added logging for pruning streams
dmatej Nov 19, 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 bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<artifactId>grizzly-bom</artifactId>
<packaging>pom</packaging>
<name>grizzly-bom</name>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>

<description>Grizzly Bill of Materials (BOM)</description>

Expand Down
4 changes: 2 additions & 2 deletions extras/bundles/grizzly-httpservice-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<name>Grizzly OSGi HttpService Bundle</name>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<groupId>org.glassfish.grizzly.osgi</groupId>
<artifactId>grizzly-httpservice-bundle</artifactId>
<build>
Expand Down
4 changes: 2 additions & 2 deletions extras/bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-extra-bundles</artifactId>
<packaging>pom</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-extra-bundles</name>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions extras/connection-pool/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connection-pool</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>connection-pool</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/grizzly-httpservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<name>Grizzly OSGi HttpService</name>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<groupId>org.glassfish.grizzly.osgi</groupId>
<artifactId>grizzly-httpservice</artifactId>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions extras/http-server-jaxws/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-server-jaxws</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-http-server-jaxws</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/http-server-multipart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-server-multipart</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-http-server-multipart</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/http-servlet-extras/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-servlet-extras</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-http-servlet-extras</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-extras</artifactId>
<packaging>pom</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-extras</name>
<profiles>
<profile>
Expand Down
4 changes: 2 additions & 2 deletions extras/tls-sni/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tls-sni</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>tls-sni</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/comet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-comet-server</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-comet-server</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-core</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-core</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/http-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-all</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-all</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/http-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-servlet-server</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-http-servlet-server</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-server-core</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-http-server-core</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-bundles</artifactId>
<packaging>pom</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-bundles</name>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/websockets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-websockets-server</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-websockets-server</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/comet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-comet</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-comet</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/grizzly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-framework</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5-SNAPSHOT</version>
<name>grizzly-framework</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
25 changes: 17 additions & 8 deletions modules/grizzly/src/main/java/org/glassfish/grizzly/CloseReason.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@

/**
* An object, describing the reason why {@link Connection} was closed.
*
*
* @author Alexey Stashok
*/
public class CloseReason {
private static final IOException LOCALLY_CLOSED;
private static final IOException REMOTELY_CLOSED;

public static final CloseReason LOCALLY_CLOSED_REASON;
public static final CloseReason REMOTELY_CLOSED_REASON;

static {
LOCALLY_CLOSED = new IOException("Locally closed");
LOCALLY_CLOSED.setStackTrace(new StackTraceElement[0]);

REMOTELY_CLOSED = new IOException("Remotely closed");
REMOTELY_CLOSED.setStackTrace(new StackTraceElement[0]);

Expand All @@ -42,7 +42,7 @@ public class CloseReason {
REMOTELY_CLOSED_REASON =
new CloseReason(org.glassfish.grizzly.CloseType.REMOTELY, REMOTELY_CLOSED);
}

private final CloseType type;
private final IOException cause;

Expand All @@ -57,7 +57,7 @@ public CloseReason(final CloseType type, final IOException cause) {

/**
* Return information whether {@link Connection} was closed locally or remotely.
*
*
* @return information whether {@link Connection} was closed locally or remotely
*/
public CloseType getType() {
Expand All @@ -67,13 +67,22 @@ public CloseType getType() {
/**
* Returns information about an error, that caused the {@link Connection} to
* be closed.
*
*
* If the cause wasn't specified by user - the default value {@link #DEFAULT_CAUSE} will be returned.
*
*
* @return information about an error, that caused the {@link Connection} to
* be closed
*/
public IOException getCause() {
return cause;
}


/**
* Returns also type and cause.
*/
@Override
public String toString() {
return super.toString() + "[type="+ getType() + ", cause=" + getCause() + "]";
}
}
Loading