[tomcat] branch main updated: Cleanup
This is an automated email from the ASF dual-hosted git repository.
remm 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 7f5793c72b Cleanup
7f5793c72b is described below
commit 7f5793c72b85ee20c0c7b6cc9cd5611d61a3ffa3
Author: remm
AuthorDate: Mon Sep 18 12:36:33 2023 +0200
Cleanup
Remove old comments. This is a part of Tomcat and is supported.
Found by coverity.
---
.../tomcat/util/modeler/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/modeler/Registry.java | 19 ---
.../modules/MbeansDescriptorsDigesterSource.java | 6 --
3 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/tomcat/util/modeler/LocalStrings.properties
b/java/org/apache/tomcat/util/modeler/LocalStrings.properties
index 57e76a890c..8c0825d81c 100644
--- a/java/org/apache/tomcat/util/modeler/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/modeler/LocalStrings.properties
@@ -38,6 +38,7 @@ modules.digesterParseError=Error parsing registry data
modules.readDescriptorsError=Error reading descriptors
registry.initError=Error initializing [{0}]
+registry.invalidSource=Invalid source specified, must be either URL, File,
Class or InputStream
registry.loadError=Error loading descriptors from [{0}]
registry.noDisable=The MBean registry cannot be disabled because it has
already been initialised
registry.noMetadata=Cannot find metadata for object [{0}]
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index 2d981b41db..eaa9961a26 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -42,16 +42,6 @@ import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.modeler.modules.ModelerSource;
import org.apache.tomcat.util.res.StringManager;
-/*
- Issues:
- - exceptions - too many "throws Exception"
- - double check the interfaces
- - start removing the use of the experimental methods in tomcat, then remove
- the methods ( before 1.1 final )
- - is the security enough to prevent Registry being used to avoid the
- permission checks in the mbean server ?
- */
-
/**
* Registry for modeler MBeans.
*
@@ -60,9 +50,6 @@ import org.apache.tomcat.util.res.StringManager;
*
* This class is itself an mbean.
*
- * IMPORTANT: public methods not marked with {@code @since x.x} are
experimental
- * or internal. Should not be used.
- *
* @author Craig R. McClanahan
* @author Costin Manolache
*/
@@ -520,7 +507,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
/**
- * EXPERIMENTAL Convert a string to object, based on type. Used by several
+ * Convert a string to object, based on type. Used by several
* components. We could provide some pluggability. It is here to keep
things
* consistent and avoid duplication in other tasks
*
@@ -552,7 +539,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
/**
- * Experimental. Load descriptors.
+ * Load descriptors.
*
* @param sourceType The source type
* @param source The bean
@@ -593,6 +580,8 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
if (sourceType == null) {
sourceType = "MbeansDescriptorsIntrospectionSource";
}
+} else {
+throw new
IllegalArgumentException(sm.getString("registry.invalidSource"));
}
if (sourceType == null) {
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
index 5052291723..5aeb701c24 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
@@ -46,9 +46,11 @@ public class MbeansDescriptorsDigesterSource extends
ModelerSource
digester.setValidating(false);
URL url = Registry.getRegistry(null, null).getClass().getResource
("/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd");
-digester.register
+if (url != null) {
+digester.register
("-//Apache Software Foundation//DTD Model MBeans Configuration
File",
-url.toString());
+url.toString());
+}
// Configure the parsing rules
digester.addObjectCreate
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Cleanup
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new f1f129e8c7 Cleanup
f1f129e8c7 is described below
commit f1f129e8c7004d7c50218fe4f6d471361a720414
Author: remm
AuthorDate: Mon Sep 18 12:36:33 2023 +0200
Cleanup
Remove old comments. This is a part of Tomcat and is supported.
Found by coverity.
---
.../tomcat/util/modeler/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/modeler/Registry.java | 19 ---
.../modules/MbeansDescriptorsDigesterSource.java | 6 --
3 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/tomcat/util/modeler/LocalStrings.properties
b/java/org/apache/tomcat/util/modeler/LocalStrings.properties
index 57e76a890c..8c0825d81c 100644
--- a/java/org/apache/tomcat/util/modeler/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/modeler/LocalStrings.properties
@@ -38,6 +38,7 @@ modules.digesterParseError=Error parsing registry data
modules.readDescriptorsError=Error reading descriptors
registry.initError=Error initializing [{0}]
+registry.invalidSource=Invalid source specified, must be either URL, File,
Class or InputStream
registry.loadError=Error loading descriptors from [{0}]
registry.noDisable=The MBean registry cannot be disabled because it has
already been initialised
registry.noMetadata=Cannot find metadata for object [{0}]
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index 2d981b41db..eaa9961a26 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -42,16 +42,6 @@ import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.modeler.modules.ModelerSource;
import org.apache.tomcat.util.res.StringManager;
-/*
- Issues:
- - exceptions - too many "throws Exception"
- - double check the interfaces
- - start removing the use of the experimental methods in tomcat, then remove
- the methods ( before 1.1 final )
- - is the security enough to prevent Registry being used to avoid the
- permission checks in the mbean server ?
- */
-
/**
* Registry for modeler MBeans.
*
@@ -60,9 +50,6 @@ import org.apache.tomcat.util.res.StringManager;
*
* This class is itself an mbean.
*
- * IMPORTANT: public methods not marked with {@code @since x.x} are
experimental
- * or internal. Should not be used.
- *
* @author Craig R. McClanahan
* @author Costin Manolache
*/
@@ -520,7 +507,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
/**
- * EXPERIMENTAL Convert a string to object, based on type. Used by several
+ * Convert a string to object, based on type. Used by several
* components. We could provide some pluggability. It is here to keep
things
* consistent and avoid duplication in other tasks
*
@@ -552,7 +539,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
/**
- * Experimental. Load descriptors.
+ * Load descriptors.
*
* @param sourceType The source type
* @param source The bean
@@ -593,6 +580,8 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
if (sourceType == null) {
sourceType = "MbeansDescriptorsIntrospectionSource";
}
+} else {
+throw new
IllegalArgumentException(sm.getString("registry.invalidSource"));
}
if (sourceType == null) {
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
index 5052291723..5aeb701c24 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
@@ -46,9 +46,11 @@ public class MbeansDescriptorsDigesterSource extends
ModelerSource
digester.setValidating(false);
URL url = Registry.getRegistry(null, null).getClass().getResource
("/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd");
-digester.register
+if (url != null) {
+digester.register
("-//Apache Software Foundation//DTD Model MBeans Configuration
File",
-url.toString());
+url.toString());
+}
// Configure the parsing rules
digester.addObjectCreate
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Cleanup
This is an automated email from the ASF dual-hosted git repository.
remm 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 a174848fad Cleanup
a174848fad is described below
commit a174848fadd11da2b5e4c64a107746b8ccca49d4
Author: remm
AuthorDate: Mon Sep 18 12:36:33 2023 +0200
Cleanup
Remove old comments. This is a part of Tomcat and is supported.
Found by coverity.
---
.../tomcat/util/modeler/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/modeler/Registry.java | 19 ---
.../modules/MbeansDescriptorsDigesterSource.java | 6 --
3 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/tomcat/util/modeler/LocalStrings.properties
b/java/org/apache/tomcat/util/modeler/LocalStrings.properties
index 57e76a890c..8c0825d81c 100644
--- a/java/org/apache/tomcat/util/modeler/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/modeler/LocalStrings.properties
@@ -38,6 +38,7 @@ modules.digesterParseError=Error parsing registry data
modules.readDescriptorsError=Error reading descriptors
registry.initError=Error initializing [{0}]
+registry.invalidSource=Invalid source specified, must be either URL, File,
Class or InputStream
registry.loadError=Error loading descriptors from [{0}]
registry.noDisable=The MBean registry cannot be disabled because it has
already been initialised
registry.noMetadata=Cannot find metadata for object [{0}]
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index 2d981b41db..eaa9961a26 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -42,16 +42,6 @@ import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.modeler.modules.ModelerSource;
import org.apache.tomcat.util.res.StringManager;
-/*
- Issues:
- - exceptions - too many "throws Exception"
- - double check the interfaces
- - start removing the use of the experimental methods in tomcat, then remove
- the methods ( before 1.1 final )
- - is the security enough to prevent Registry being used to avoid the
- permission checks in the mbean server ?
- */
-
/**
* Registry for modeler MBeans.
*
@@ -60,9 +50,6 @@ import org.apache.tomcat.util.res.StringManager;
*
* This class is itself an mbean.
*
- * IMPORTANT: public methods not marked with {@code @since x.x} are
experimental
- * or internal. Should not be used.
- *
* @author Craig R. McClanahan
* @author Costin Manolache
*/
@@ -520,7 +507,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
/**
- * EXPERIMENTAL Convert a string to object, based on type. Used by several
+ * Convert a string to object, based on type. Used by several
* components. We could provide some pluggability. It is here to keep
things
* consistent and avoid duplication in other tasks
*
@@ -552,7 +539,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
/**
- * Experimental. Load descriptors.
+ * Load descriptors.
*
* @param sourceType The source type
* @param source The bean
@@ -593,6 +580,8 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
if (sourceType == null) {
sourceType = "MbeansDescriptorsIntrospectionSource";
}
+} else {
+throw new
IllegalArgumentException(sm.getString("registry.invalidSource"));
}
if (sourceType == null) {
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
index 5052291723..5aeb701c24 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
@@ -46,9 +46,11 @@ public class MbeansDescriptorsDigesterSource extends
ModelerSource
digester.setValidating(false);
URL url = Registry.getRegistry(null, null).getClass().getResource
("/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd");
-digester.register
+if (url != null) {
+digester.register
("-//Apache Software Foundation//DTD Model MBeans Configuration
File",
-url.toString());
+url.toString());
+}
// Configure the parsing rules
digester.addObjectCreate
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Cleanup
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 373ba3e427 Cleanup
373ba3e427 is described below
commit 373ba3e4270c76cce6e0d7d93e09218ed962ed16
Author: remm
AuthorDate: Mon Sep 18 12:36:33 2023 +0200
Cleanup
Remove old comments. This is a part of Tomcat and is supported.
Found by coverity.
---
java/org/apache/tomcat/util/modeler/Registry.java | 19 ---
.../modules/MbeansDescriptorsDigesterSource.java | 6 --
2 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index cd061ef929..bd473723ce 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -41,16 +41,6 @@ import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.modeler.modules.ModelerSource;
import org.apache.tomcat.util.res.StringManager;
-/*
- Issues:
- - exceptions - too many "throws Exception"
- - double check the interfaces
- - start removing the use of the experimental methods in tomcat, then remove
- the methods ( before 1.1 final )
- - is the security enough to prevent Registry being used to avoid the
- permission checks in the mbean server ?
- */
-
/**
* Registry for modeler MBeans.
*
@@ -59,9 +49,6 @@ import org.apache.tomcat.util.res.StringManager;
*
* This class is itself an mbean.
*
- * IMPORTANT: public methods not marked with {@code @since x.x} are
experimental
- * or internal. Should not be used.
- *
* @author Craig R. McClanahan
* @author Costin Manolache
*/
@@ -516,7 +503,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
/**
- * EXPERIMENTAL Convert a string to object, based on type. Used by several
+ * Convert a string to object, based on type. Used by several
* components. We could provide some pluggability. It is here to keep
things
* consistent and avoid duplication in other tasks
*
@@ -548,7 +535,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
/**
- * Experimental. Load descriptors.
+ * Load descriptors.
*
* @param sourceType The source type
* @param source The bean
@@ -589,6 +576,8 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
if (sourceType == null) {
sourceType = "MbeansDescriptorsIntrospectionSource";
}
+} else {
+throw new IllegalArgumentException("Invalid source specified, must
be either URL, File, Class or InputStream");
}
if (sourceType == null) {
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
index 5052291723..5aeb701c24 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
@@ -46,9 +46,11 @@ public class MbeansDescriptorsDigesterSource extends
ModelerSource
digester.setValidating(false);
URL url = Registry.getRegistry(null, null).getClass().getResource
("/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd");
-digester.register
+if (url != null) {
+digester.register
("-//Apache Software Foundation//DTD Model MBeans Configuration
File",
-url.toString());
+url.toString());
+}
// Configure the parsing rules
digester.addObjectCreate
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix unlikely NPE
This is an automated email from the ASF dual-hosted git repository. remm 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 39116f891d Fix unlikely NPE 39116f891d is described below commit 39116f891de8589d31888eaab4233526967ccd64 Author: remm AuthorDate: Mon Sep 18 12:53:38 2023 +0200 Fix unlikely NPE Found by coverity. --- java/org/apache/tomcat/util/net/NioEndpoint.java | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index 17be76bae3..bd34a961b8 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -1452,8 +1452,12 @@ public class NioEndpoint extends AbstractNetworkChannelEndpoint
[tomcat] branch 10.1.x updated: Fix unlikely NPE
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 350fd54047 Fix unlikely NPE
350fd54047 is described below
commit 350fd5404797ed1d49052dff409067bc7b53eabf
Author: remm
AuthorDate: Mon Sep 18 12:53:38 2023 +0200
Fix unlikely NPE
Found by coverity.
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index e817945272..b0fc284a05 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1447,8 +1447,12 @@ public class NioEndpoint extends
AbstractJsseEndpoint
public SendfileState processSendfile(SendfileDataBase sendfileData) {
setSendfileData((SendfileData) sendfileData);
SelectionKey key =
getSocket().getIOChannel().keyFor(getPoller().getSelector());
-// Might as well do the first write on this thread
-return getPoller().processSendfile(key, this, true);
+if (key == null) {
+return SendfileState.ERROR;
+} else {
+// Might as well do the first write on this thread
+return getPoller().processSendfile(key, this, true);
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix unlikely NPE
This is an automated email from the ASF dual-hosted git repository.
remm 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 28fa5f87e5 Fix unlikely NPE
28fa5f87e5 is described below
commit 28fa5f87e5b91ec4f2776832b67fa3316e087a4c
Author: remm
AuthorDate: Mon Sep 18 12:53:38 2023 +0200
Fix unlikely NPE
Found by coverity.
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index e7491ea3f9..506a441997 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1497,8 +1497,12 @@ public class NioEndpoint extends
AbstractJsseEndpoint
public SendfileState processSendfile(SendfileDataBase sendfileData) {
setSendfileData((SendfileData) sendfileData);
SelectionKey key =
getSocket().getIOChannel().keyFor(getPoller().getSelector());
-// Might as well do the first write on this thread
-return getPoller().processSendfile(key, this, true);
+if (key == null) {
+return SendfileState.ERROR;
+} else {
+// Might as well do the first write on this thread
+return getPoller().processSendfile(key, this, true);
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix unlikely NPE
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 8bc2adee92 Fix unlikely NPE
8bc2adee92 is described below
commit 8bc2adee92397fef0fcf9a05e9f4a46cec34e1cb
Author: remm
AuthorDate: Mon Sep 18 12:53:38 2023 +0200
Fix unlikely NPE
Found by coverity.
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index fcf8c80ea8..8ef737ae7e 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1397,8 +1397,12 @@ public class NioEndpoint extends
AbstractJsseEndpoint
public SendfileState processSendfile(SendfileDataBase sendfileData) {
setSendfileData((SendfileData) sendfileData);
SelectionKey key =
getSocket().getIOChannel().keyFor(getPoller().getSelector());
-// Might as well do the first write on this thread
-return getPoller().processSendfile(key, this, true);
+if (key == null) {
+return SendfileState.ERROR;
+} else {
+// Might as well do the first write on this thread
+return getPoller().processSendfile(key, this, true);
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] coheigea opened a new pull request, #670: Adding ASL Bundle-License to the manifests
coheigea opened a new pull request, #670: URL: https://github.com/apache/tomcat/pull/670 Other ASF projects like CXF that are built using the maven-bundle-plugin have the pom license automatically inserted into the manifest as "Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt";. This helps tools like syft determine the license when building an SBOM. This PR adds this to the Tomcat jars so that Syft can automatically determine the correct license. If approved please backport to 10.x + 9.x. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix formatting
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 5484d6fc11 Fix formatting
5484d6fc11 is described below
commit 5484d6fc11d8bf8484370252edac2f8c9ee4a26c
Author: Mark Thomas
AuthorDate: Mon Sep 18 15:46:14 2023 +0100
Fix formatting
---
test/org/apache/catalina/filters/TesterHttpServletResponse.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/filters/TesterHttpServletResponse.java
b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
index aa9b00a28c..38e8e53617 100644
--- a/test/org/apache/catalina/filters/TesterHttpServletResponse.java
+++ b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
@@ -201,7 +201,8 @@ public class TesterHttpServletResponse implements
HttpServletResponse {
}
public void recycle() {
-/* NOOP */}
+/* NOOP */
+}
/**
* @param b Unused
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Fix formatting
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new d15a1287e3 Fix formatting
d15a1287e3 is described below
commit d15a1287e374399ba014ae7cbe42366764209c36
Author: Mark Thomas
AuthorDate: Mon Sep 18 15:46:14 2023 +0100
Fix formatting
---
test/org/apache/catalina/filters/TesterHttpServletResponse.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/filters/TesterHttpServletResponse.java
b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
index a440da7837..5f8d52d783 100644
--- a/test/org/apache/catalina/filters/TesterHttpServletResponse.java
+++ b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
@@ -201,7 +201,8 @@ public class TesterHttpServletResponse implements
HttpServletResponse {
}
public void recycle() {
-/* NOOP */}
+/* NOOP */
+}
/**
* @param b Unused
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Fix formatting
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3fa9fc41710c36c14f75b0572e48b1dab6e9de33
Author: Mark Thomas
AuthorDate: Mon Sep 18 15:46:14 2023 +0100
Fix formatting
---
test/org/apache/catalina/filters/TesterHttpServletResponse.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/filters/TesterHttpServletResponse.java
b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
index a87f8da7e7..7115aae763 100644
--- a/test/org/apache/catalina/filters/TesterHttpServletResponse.java
+++ b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
@@ -201,7 +201,8 @@ public class TesterHttpServletResponse implements
HttpServletResponse {
}
public void recycle() {
-/* NOOP */}
+/* NOOP */
+}
/**
* @param b Unused
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Update false positives for FileUpload
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit c514d421e969085b45856a9b40ff2af7eaaf7ab2 Author: Mark Thomas AuthorDate: Sat Sep 16 09:56:50 2023 +0100 Update false positives for FileUpload --- res/spotbugs/filter-false-positives.xml | 23 +-- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index 4cec867f47..5a393c2da5 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -1601,33 +1601,12 @@ - - - - - - - - - - + - - - - - - - - - - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (28fa5f87e5 -> 3fa9fc4171)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 28fa5f87e5 Fix unlikely NPE new c514d421e9 Update false positives for FileUpload new b62a595747 Remove unused code new 3fa9fc4171 Fix formatting The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../util/http/fileupload/MultipartStream.java | 21 res/spotbugs/filter-false-positives.xml| 23 +- .../filters/TesterHttpServletResponse.java | 3 ++- 3 files changed, 3 insertions(+), 44 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Remove unused code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b62a595747880b9a1a3595751be0cad8c24975bc
Author: Mark Thomas
AuthorDate: Sat Sep 16 10:59:13 2023 +0100
Remove unused code
---
.../util/http/fileupload/MultipartStream.java | 21 -
1 file changed, 21 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
index 137185aa77..179673654c 100644
--- a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
+++ b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
@@ -650,27 +650,6 @@ public class MultipartStream {
return true;
}
-/**
- * Searches for a byte of specified value in the {@code buffer},
- * starting at the specified {@code position}.
- *
- * @param value The value to find.
- * @param pos The starting position for searching.
- *
- * @return The position of byte found, counting from beginning of the
- * {@code buffer}, or {@code -1} if not found.
- */
-protected int findByte(final byte value,
-final int pos) {
-for (int i = pos; i < tail; i++) {
-if (buffer[i] == value) {
-return i;
-}
-}
-
-return -1;
-}
-
/**
* Searches for the {@code boundary} in the {@code buffer}
* region delimited by {@code head} and {@code tail}.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Fix formatting
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4e659cf966ffb749dd4afae7a0b43e00b04035bd
Author: Mark Thomas
AuthorDate: Mon Sep 18 15:46:14 2023 +0100
Fix formatting
---
test/org/apache/catalina/filters/TesterHttpServletResponse.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/filters/TesterHttpServletResponse.java
b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
index dba93188ae..9ca2089aa0 100644
--- a/test/org/apache/catalina/filters/TesterHttpServletResponse.java
+++ b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
@@ -199,7 +199,8 @@ public class TesterHttpServletResponse implements
HttpServletResponse {
}
public void recycle() {
-/* NOOP */}
+/* NOOP */
+}
/**
* @param b Unused
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Remove unused code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a188c710d3e02c83103e0de83524ecc940ccb760
Author: Mark Thomas
AuthorDate: Sat Sep 16 11:00:05 2023 +0100
Remove unused code
---
.../util/http/fileupload/MultipartStream.java | 21 -
1 file changed, 21 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
index 137185aa77..179673654c 100644
--- a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
+++ b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
@@ -650,27 +650,6 @@ public class MultipartStream {
return true;
}
-/**
- * Searches for a byte of specified value in the {@code buffer},
- * starting at the specified {@code position}.
- *
- * @param value The value to find.
- * @param pos The starting position for searching.
- *
- * @return The position of byte found, counting from beginning of the
- * {@code buffer}, or {@code -1} if not found.
- */
-protected int findByte(final byte value,
-final int pos) {
-for (int i = pos; i < tail; i++) {
-if (buffer[i] == value) {
-return i;
-}
-}
-
-return -1;
-}
-
/**
* Searches for the {@code boundary} in the {@code buffer}
* region delimited by {@code head} and {@code tail}.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (8bc2adee92 -> 4e659cf966)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 8bc2adee92 Fix unlikely NPE new a188c710d3 Remove unused code new 4e659cf966 Fix formatting The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../util/http/fileupload/MultipartStream.java | 21 - .../catalina/filters/TesterHttpServletResponse.java | 3 ++- 2 files changed, 2 insertions(+), 22 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
