[tomcat] branch master updated: Tab police
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 613787d Tab police
613787d is described below
commit 613787d26fe14aec775fe82e59d0e4bc079d1814
Author: Mark Thomas
AuthorDate: Mon Sep 21 09:37:20 2020 +0100
Tab police
---
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index ca0e6fd..c5c79cb 100644
--- a/build.xml
+++ b/build.xml
@@ -2325,7 +2325,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
+
@@ -3062,7 +3062,7 @@ skip.installer property in build.properties" />
+ depends="setup-bnd">
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Tab police
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 584fed1 Tab police 584fed1 is described below commit 584fed1e20b9b8acb38231a14e06f5ed24f8bdcc Author: Mark Thomas AuthorDate: Tue Jun 23 12:02:34 2020 +0100 Tab police All Tomcat source should use spaces (typically 4) rather than tab --- res/bnd/jasper-el.jar.tmp.bnd | 4 ++-- res/bnd/tomcat-embed-el.jar.tmp.bnd| 4 ++-- res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 +- res/bnd/tomcat-util.jar.tmp.bnd| 4 ++-- res/bnd/tomcat-websocket.jar.tmp.bnd | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd index 45b2744..549215b 100644 --- a/res/bnd/jasper-el.jar.tmp.bnd +++ b/res/bnd/jasper-el.jar.tmp.bnd @@ -23,7 +23,7 @@ Export-Package: \ org.apache.el.parser -includepackage: \ - org.apache.el.stream,\ - org.apache.el.util +org.apache.el.stream,\ +org.apache.el.util -includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/ \ No newline at end of file diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd b/res/bnd/tomcat-embed-el.jar.tmp.bnd index cdd3a28..911ee04 100644 --- a/res/bnd/tomcat-embed-el.jar.tmp.bnd +++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd @@ -25,8 +25,8 @@ Export-Package: \ org.apache.el.parser -includepackage: \ - org.apache.el.stream,\ - org.apache.el.util +org.apache.el.stream,\ +org.apache.el.util -includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/ diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd index a47db3a..329d9c7 100644 --- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd +++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd @@ -24,7 +24,7 @@ Export-Package: \ org.apache.tomcat.websocket.server -includepackage: \ - org.apache.tomcat.websocket.pojo +org.apache.tomcat.websocket.pojo -includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/ diff --git a/res/bnd/tomcat-util.jar.tmp.bnd b/res/bnd/tomcat-util.jar.tmp.bnd index d1011d9..6349a7c 100644 --- a/res/bnd/tomcat-util.jar.tmp.bnd +++ b/res/bnd/tomcat-util.jar.tmp.bnd @@ -29,5 +29,5 @@ Export-Package: \ org.apache.tomcat.util.threads -includepackage: \ - org.apache.tomcat.util.json,\ - org.apache.tomcat.util.threads.res \ No newline at end of file +org.apache.tomcat.util.json,\ +org.apache.tomcat.util.threads.res \ No newline at end of file diff --git a/res/bnd/tomcat-websocket.jar.tmp.bnd b/res/bnd/tomcat-websocket.jar.tmp.bnd index 13f1423..f347dfc 100644 --- a/res/bnd/tomcat-websocket.jar.tmp.bnd +++ b/res/bnd/tomcat-websocket.jar.tmp.bnd @@ -22,6 +22,6 @@ Export-Package: \ org.apache.tomcat.websocket.server -includepackage: \ - org.apache.tomcat.websocket.pojo +org.apache.tomcat.websocket.pojo -includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/ \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Tab police
On 22/04/2020 16:25, r...@apache.org wrote: > This is an automated email from the ASF dual-hosted git repository. > > remm pushed a commit to branch master > in repository https://gitbox.apache.org/repos/asf/tomcat.git > > > The following commit(s) were added to refs/heads/master by this push: > new 093de0b Tab police > 093de0b is described below > > commit 093de0b8881fefaef7ed462ece820cf52bfa902c > Author: remm > AuthorDate: Wed Apr 22 17:25:35 2020 +0200 > > Tab police Thanks for catching this. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Tab police
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 093de0b Tab police
093de0b is described below
commit 093de0b8881fefaef7ed462ece820cf52bfa902c
Author: remm
AuthorDate: Wed Apr 22 17:25:35 2020 +0200
Tab police
---
java/org/apache/catalina/core/DefaultInstanceManager.java | 3 +--
test/org/apache/tomcat/unittest/TesterContext.java| 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index 4a8adc3..efeb968 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -444,8 +444,7 @@ public class DefaultInstanceManager implements
InstanceManager {
// Use common object to save memory
annotationsArray = ANNOTATIONS_EMPTY;
} else {
-annotationsArray = annotations.toArray(
- new
AnnotationCacheEntry[0]);
+annotationsArray = annotations.toArray(new
AnnotationCacheEntry[0]);
}
synchronized (annotationCache) {
annotationCache.put(clazz, annotationsArray);
diff --git a/test/org/apache/tomcat/unittest/TesterContext.java
b/test/org/apache/tomcat/unittest/TesterContext.java
index 4e97140..ebee177 100644
--- a/test/org/apache/tomcat/unittest/TesterContext.java
+++ b/test/org/apache/tomcat/unittest/TesterContext.java
@@ -101,8 +101,7 @@ public class TesterContext implements Context {
@Override
public SecurityConstraint[] findConstraints() {
-return securityConstraints.toArray(
- new SecurityConstraint[0]);
+return securityConstraints.toArray(new SecurityConstraint[0]);
}
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Tab police
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 93ca69c Tab police
93ca69c is described below
commit 93ca69c06280ec2f4edc2220d97dff0a2de2f1c4
Author: Mark Thomas
AuthorDate: Mon Jan 13 10:38:45 2020 +
Tab police
---
java/org/apache/catalina/ha/session/DeltaManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index b077bae..09584fc 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -485,7 +485,7 @@ public class DeltaManager extends ClusterManagerBase{
@Override
public void changeSessionId(Session session) {
- rotateSessionId(session);
+rotateSessionId(session);
}
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Tab police.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d957ec4 Tab police.
d957ec4 is described below
commit d957ec4d67544087ed8fa7b94ee6731ce453a51c
Author: Mark Thomas
AuthorDate: Sat Dec 7 15:39:14 2019 +
Tab police.
Sorry still getting new development VM set up correctly
---
test/org/apache/tomcat/util/net/TestSsl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestSsl.java
b/test/org/apache/tomcat/util/net/TestSsl.java
index 7a2ee32..b777f2c 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -140,8 +140,8 @@ public class TestSsl extends TomcatBaseTest {
// Handshake complete appears to be called asynchronously
int wait = 0;
while (wait < 5000 && !listener.isComplete()) {
- wait += 50;
- Thread.sleep(50);
+wait += 50;
+Thread.sleep(50);
}
Assert.assertTrue("Checking no client issuer has been requested",
TesterSupport.getLastClientAuthRequestedIssuerCount() == 0);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
