This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new b85934fe3d Minor fixes from code review
b85934fe3d is described below
commit b85934fe3d7641d9ce42e7b0596217567e982916
Author: remm <[email protected]>
AuthorDate: Wed Jun 17 16:02:38 2026 +0200
Minor fixes from code review
---
java/javax/websocket/server/ServerEndpointConfig.java | 5 +++++
java/org/apache/catalina/core/StandardServer.java | 2 +-
java/org/apache/catalina/tribes/group/AbsoluteOrder.java | 2 +-
java/org/apache/tomcat/websocket/WsFrameBase.java | 3 ++-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/java/javax/websocket/server/ServerEndpointConfig.java
b/java/javax/websocket/server/ServerEndpointConfig.java
index 07444a51ac..4b3958c73f 100644
--- a/java/javax/websocket/server/ServerEndpointConfig.java
+++ b/java/javax/websocket/server/ServerEndpointConfig.java
@@ -85,6 +85,11 @@ public interface ServerEndpointConfig extends EndpointConfig
{
this.path = path;
}
+ /**
+ * Builds and returns a {@link ServerEndpointConfig} with the
configured settings.
+ *
+ * @return The configured server endpoint configuration
+ */
public ServerEndpointConfig build() {
return new DefaultServerEndpointConfig(endpointClass, path,
subprotocols, extensions, encoders, decoders,
configurator);
diff --git a/java/org/apache/catalina/core/StandardServer.java
b/java/org/apache/catalina/core/StandardServer.java
index 7cd9757509..dbfe21a58b 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -835,7 +835,7 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
ObjectName sname = new ObjectName("Catalina:type=StoreConfig");
MBeanServer server = Registry.getRegistry(null).getMBeanServer();
if (server.isRegistered(sname)) {
- server.invoke(sname, "store", new Object[] { context }, new
String[] { "java.lang.String" });
+ server.invoke(sname, "store", new Object[] { context }, new
String[] { "org.apache.catalina.Context" });
} else {
log.error(sm.getString("standardServer.storeConfig.notAvailable", sname));
}
diff --git a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
index 494b8cc93c..441adc3623 100644
--- a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
+++ b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
@@ -169,7 +169,7 @@ public class AbsoluteOrder {
* @return comparison result
*/
protected int compareBytes(byte b1, byte b2) {
- return compareInts(b1, b2);
+ return compareInts(b1 & 0xFF, b2 & 0xFF);
}
/**
diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index b3807e74eb..21e96635a7 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -357,7 +357,8 @@ public abstract class WsFrameBase {
new CloseReason(CloseCodes.PROTOCOL_ERROR,
sm.getString("wsFrame.oneByteCloseCode")));
}
if (controlBufferBinary.remaining() > 1) {
- code = controlBufferBinary.getShort();
+ short rawCode = controlBufferBinary.getShort();
+ code = rawCode & 0xFFFF;
if (controlBufferBinary.remaining() > 0) {
CoderResult cr =
utf8DecoderControl.decode(controlBufferBinary, controlBufferText, true);
if (cr.isError()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
