This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 2e3985d061 Minor fixes from code review
2e3985d061 is described below
commit 2e3985d061e49c5f0e1d5b6793ba12d4fa11c88c
Author: remm <[email protected]>
AuthorDate: Wed Jun 17 16:02:38 2026 +0200
Minor fixes from code review
---
java/jakarta/websocket/server/ServerEndpointConfig.java | 2 +-
java/org/apache/catalina/core/StandardServer.java | 2 +-
java/org/apache/catalina/tribes/group/AbsoluteOrder.java | 2 +-
java/org/apache/el/parser/AstIdentifier.java | 2 +-
java/org/apache/tomcat/websocket/WsFrameBase.java | 3 ++-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/jakarta/websocket/server/ServerEndpointConfig.java
b/java/jakarta/websocket/server/ServerEndpointConfig.java
index caf697a61b..165dd925a8 100644
--- a/java/jakarta/websocket/server/ServerEndpointConfig.java
+++ b/java/jakarta/websocket/server/ServerEndpointConfig.java
@@ -113,7 +113,7 @@ public interface ServerEndpointConfig extends
EndpointConfig {
this.path = path;
}
- /**
+ /**
* Builds and returns a {@link ServerEndpointConfig} with the
configured settings.
*
* @return The configured server endpoint configuration
diff --git a/java/org/apache/catalina/core/StandardServer.java
b/java/org/apache/catalina/core/StandardServer.java
index 7d6442668c..2c4856e018 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -827,7 +827,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 a61a4ba16a..d60486f95a 100644
--- a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
+++ b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
@@ -171,7 +171,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/el/parser/AstIdentifier.java
b/java/org/apache/el/parser/AstIdentifier.java
index 1161597b90..56330d5125 100644
--- a/java/org/apache/el/parser/AstIdentifier.java
+++ b/java/org/apache/el/parser/AstIdentifier.java
@@ -88,7 +88,7 @@ public final class AstIdentifier extends SimpleNode {
} finally {
// Always reset the flag to false so the optimisation is not
applied
// inappropriately
- ctx.putContext(this.getClass(), Boolean.FALSE);
+ ctx.putContext(ELResolver.StandaloneIdentifierMarker.class,
Boolean.FALSE);
}
if (ctx.isPropertyResolved()) {
diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index 2d8dcf6bba..17463fa89b 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]
