On 03/04/2023 15:15, Rémy Maucherat wrote:
On Mon, Apr 3, 2023 at 10:14 AM <ma...@apache.org> wrote:

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 fa2e5b7ebb Import remm's fix for BZ 66545
fa2e5b7ebb is described below

commit fa2e5b7ebb939f10cb023f15db387884e43d3d56
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Apr 3 09:14:00 2023 +0100

     Import remm's fix for BZ 66545

     https://bz.apache.org/bugzilla/show_bug.cgi?id=66545

I didn't really know how to handle it (either put it in git or in poe
;) ), so it looks like I should have put that change in git. I was
monitoring to rectify if it got overwritten during import or
something.

No worries. I had checking I didn't overwrite anything on my TODO list too.

This was a slightly unusual case. I don't think there was a right way of doing it - just several different ones. The main thing was avoiding over-writing the changes.

Mark


Thanks !

Rémy

---
  java/org/apache/catalina/webresources/LocalStrings.properties | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/webresources/LocalStrings.properties 
b/java/org/apache/catalina/webresources/LocalStrings.properties
index af9f9fe797..aa83c3fe4f 100644
--- a/java/org/apache/catalina/webresources/LocalStrings.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings.properties
@@ -57,5 +57,5 @@ standardRoot.invalidPath=The resource path [{0}] is not valid
  standardRoot.invalidPathNormal=The resource path [{0}] has been normalized to 
[{1}] which is not valid
  standardRoot.lockedFile=The web application [{0}] failed to close the file 
[{1}] opened via the following stack trace
  standardRoot.noContext=A Context has not been configured for this 
WebResourceRoot
-standardRoot.startInvalidMain=The main resource set specified [{0}] is not 
valid
+standardRoot.startInvalidMain=The main resource set specified [{0}] is not a 
directory or war file, or is not readable (it does not exist or permissions to 
access it are missing)
  standardRoot.unsupportedProtocol=The URL protocol [{0}] is not supported by 
this web resources implementation


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to