Skip to content

Commit

Permalink
Merge pull request #5 from Pandrex247/FISH-6885
Browse files Browse the repository at this point in the history 
FISH-6885 Cherry-pick Null Check to Tyrus 2.1.3
  • Loading branch information
@Pandrex247
Pandrex247 authored Sep 11, 2023
2 parents db3ecfe + a7e808a commit 95b746d
Show file tree
Hide file tree
Showing 73 changed files with 77 additions and 72 deletions.
2 changes: 1 addition & 1 deletion archetypes/echo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.tyrus.archetypes</groupId>
<artifactId>tyrus-archetypes-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<description>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.tyrus.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-bom</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tyrus BOM</name>

Expand Down
2 changes: 1 addition & 1 deletion bundles/client-jdk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-bundles</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bundles/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-bundles</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bundles/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.tyrus.bundles</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-bundles</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>tyrus-samples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/websocket-ri-archive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-bundles</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>websocket-ri-archive</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/websocket-ri-bundle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-bundles</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>websocket-ri-bundle</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-containers-glassfish-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>bundle</packaging>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/ejb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-containers-glassfish-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>bundle</packaging>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-containers-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion containers/grizzly-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-containers-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>bundle</packaging>
Expand Down
2 changes: 1 addition & 1 deletion containers/grizzly-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-containers-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>bundle</packaging>
Expand Down
2 changes: 1 addition & 1 deletion containers/inmemory/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-containers-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>bundle</packaging>
Expand Down
2 changes: 1 addition & 1 deletion containers/jdk-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-containers-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>bundle</packaging>
Expand Down
2 changes: 1 addition & 1 deletion containers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion containers/servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-containers-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
5 changes: 5 additions & 0 deletions ...s/servlet/src/main/java/org/glassfish/tyrus/servlet/TyrusServletContainerInitializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ public void onStartup(Set<Class<?>> classes, final ServletContext ctx) throws Se
return;
}

if (ctx.getAttribute(ServerContainer.class.getName()) != null) {
// Already initialized
return;
}

classes.removeAll(FILTERED_CLASSES);

final Integer incomingBufferSize = getIntContextParam(ctx, TyrusHttpUpgradeHandler.FRAME_BUFFER_SIZE);
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>tyrus-documentation</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ext/client-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus.ext</groupId>
<artifactId>tyrus-extensions-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion ext/client-java8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus.ext</groupId>
<artifactId>tyrus-extensions-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion ext/extension-deflate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus.ext</groupId>
<artifactId>tyrus-extensions-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion ext/monitoring-jmx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus.ext</groupId>
<artifactId>tyrus-extensions-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>tyrus-monitoring-jmx</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ext/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>tyrus</name>
<description>Tyrus is the reference implementation of Java API for WebSocket (JSR-356)</description>
Expand Down
2 changes: 1 addition & 1 deletion samples/auction/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.tyrus.samples</groupId>
<artifactId>tyrus-samples-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion samples/cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.tyrus.samples</groupId>
<artifactId>tyrus-samples-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion samples/chat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.tyrus.samples</groupId>
<artifactId>tyrus-samples-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion samples/draw/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.tyrus.samples</groupId>
<artifactId>tyrus-samples-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion samples/echo-basic-auth/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.tyrus.samples</groupId>
<artifactId>tyrus-samples-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion samples/echo-https/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.tyrus.samples</groupId>
<artifactId>tyrus-samples-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion samples/echo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.tyrus.samples</groupId>
<artifactId>tyrus-samples-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.tyrus.samples</groupId>
Expand Down
2 changes: 1 addition & 1 deletion samples/programmatic-echo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.tyrus.samples</groupId>
<artifactId>tyrus-samples-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion samples/shared-collection/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.tyrus.samples</groupId>
<artifactId>tyrus-samples-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion samples/simplelife/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.tyrus.samples</groupId>
<artifactId>tyrus-samples-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion spi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion tests/containers/jdk-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus.tests</groupId>
<artifactId>tyrus-tests-containers</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/containers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus.tests</groupId>
<artifactId>tyrus-tests-project</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tests/containers/servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.tyrus.tests</groupId>
<artifactId>tyrus-tests-containers</artifactId>
<version>2.1.3.payara-p1-SNAPSHOT</version>
<version>2.1.3.payara-p2-SNAPSHOT</version>
</parent>

<packaging>war</packaging>
Expand Down
Loading

0 comments on commit 95b746d

Please sign in to comment.