[tomcat] 01/02: Simplify 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 061f8a27fdcb9f77c9a295d6969e059ddaaee4a3
Author: Mark Thomas
AuthorDate: Wed May 31 17:30:12 2023 +0100
Simplify code
---
java/org/apache/catalina/servlets/WebdavServlet.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 1716437af7..6f09cf5c7c 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -871,9 +871,7 @@ public class WebdavServlet extends DefaultServlet {
int lockDuration = DEFAULT_TIMEOUT;
String lockDurationStr = req.getHeader("Timeout");
-if (lockDurationStr == null) {
-lockDuration = DEFAULT_TIMEOUT;
-} else {
+if (lockDurationStr != null) {
int commaPos = lockDurationStr.indexOf(',');
// If multiple timeouts, just use the first
if (commaPos != -1) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Simplify code
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
commit 3e798a4739c646e2d384ada11b67ed5029db9231
Author: Mark Thomas
AuthorDate: Wed May 31 17:30:12 2023 +0100
Simplify code
---
java/org/apache/catalina/servlets/WebdavServlet.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 38448532aa..067c3d5a49 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -870,9 +870,7 @@ public class WebdavServlet extends DefaultServlet {
int lockDuration = DEFAULT_TIMEOUT;
String lockDurationStr = req.getHeader("Timeout");
-if (lockDurationStr == null) {
-lockDuration = DEFAULT_TIMEOUT;
-} else {
+if (lockDurationStr != null) {
int commaPos = lockDurationStr.indexOf(',');
// If multiple timeouts, just use the first
if (commaPos != -1) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Simplify 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 3011464c4b6cef6db7ca16b72eb7aee0f0aa7300
Author: Mark Thomas
AuthorDate: Wed May 31 17:30:12 2023 +0100
Simplify code
---
java/org/apache/catalina/servlets/WebdavServlet.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 8ab65a0b21..9b0b2e1c34 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -869,9 +869,7 @@ public class WebdavServlet extends DefaultServlet {
int lockDuration = DEFAULT_TIMEOUT;
String lockDurationStr = req.getHeader("Timeout");
-if (lockDurationStr == null) {
-lockDuration = DEFAULT_TIMEOUT;
-} else {
+if (lockDurationStr != null) {
int commaPos = lockDurationStr.indexOf(',');
// If multiple timeouts, just use the first
if (commaPos != -1) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Simplify code
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
commit 33fe0f9be8740f8f8014400807967f5086799605
Author: Mark Thomas
AuthorDate: Wed May 31 17:30:12 2023 +0100
Simplify code
---
java/org/apache/catalina/servlets/WebdavServlet.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 38448532aa..067c3d5a49 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -870,9 +870,7 @@ public class WebdavServlet extends DefaultServlet {
int lockDuration = DEFAULT_TIMEOUT;
String lockDurationStr = req.getHeader("Timeout");
-if (lockDurationStr == null) {
-lockDuration = DEFAULT_TIMEOUT;
-} else {
+if (lockDurationStr != null) {
int commaPos = lockDurationStr.indexOf(',');
// If multiple timeouts, just use the first
if (commaPos != -1) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Simplify code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit eb4beb68bf3b120b9d7fcee64e38588cb6db60f9
Author: Mark Thomas
AuthorDate: Thu Oct 22 20:44:44 2020 +0100
Simplify code
---
test/org/apache/tomcat/websocket/TesterFirehoseServer.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
b/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
index 2aa3aef..90e1c44 100644
--- a/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
+++ b/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
@@ -227,12 +227,10 @@ public class TesterFirehoseServer {
// Ignore the latch result as the message count test below will
tell us
// if the right number of messages arrived
-handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS,
-TimeUnit.MILLISECONDS);
+
Assert.assertTrue(handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS,
+TimeUnit.MILLISECONDS));
Queue messages = handler.getMessages();
-Assert.assertEquals(
-TesterFirehoseServer.MESSAGE_COUNT, messages.size());
for (String message : messages) {
Assert.assertEquals(TesterFirehoseServer.MESSAGE, message);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
