This is an automated email from the ASF dual-hosted git repository.
markt 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 673ab88cb1 Revert "Use unnamed variable to avoid IDE warnings after
refactoring"
673ab88cb1 is described below
commit 673ab88cb1f98d1dcfbb959c519de5b3d41564bc
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Mar 19 05:25:32 2025 +0000
Revert "Use unnamed variable to avoid IDE warnings after refactoring"
This reverts commit 3c9a3ef9296f880f1c54c19858027e9e8227c727.
---
java/org/apache/naming/NamingContext.java | 6 +++---
java/org/apache/tomcat/util/modeler/Registry.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/naming/NamingContext.java
b/java/org/apache/naming/NamingContext.java
index 8adf9e0d84..2912bdcd4f 100644
--- a/java/org/apache/naming/NamingContext.java
+++ b/java/org/apache/naming/NamingContext.java
@@ -639,11 +639,11 @@ public class NamingContext implements Context {
Object toBind =
NamingManager.getStateToBind(obj, name, this, env);
switch (toBind) {
- case Context _ -> entry = new NamingEntry(name.get(0),
toBind,
+ case Context context -> entry = new
NamingEntry(name.get(0), toBind,
NamingEntry.CONTEXT);
- case LinkRef _ -> entry = new NamingEntry(name.get(0),
toBind,
+ case LinkRef linkRef -> entry = new
NamingEntry(name.get(0), toBind,
NamingEntry.LINK_REF);
- case Reference _ -> entry = new NamingEntry(name.get(0),
toBind,
+ case Reference reference -> entry = new
NamingEntry(name.get(0), toBind,
NamingEntry.REFERENCE);
case Referenceable referenceable -> {
toBind = referenceable.getReference();
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index 194eea12d2..4eaf9fa7ae 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -570,7 +570,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
sourceType = "MbeansDescriptorsDigesterSource";
}
}
- case InputStream _ -> {
+ case InputStream inputStream -> {
type = param;
inputsource = source;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
