(tomcat) branch main updated: Fix indent
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 6ec0898bc6 Fix indent
6ec0898bc6 is described below
commit 6ec0898bc6ef41a359c8713da1697b43ae273fc5
Author: Mark Thomas
AuthorDate: Mon Jan 15 07:49:23 2024 +
Fix indent
---
java/org/apache/catalina/session/StandardSession.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/session/StandardSession.java
b/java/org/apache/catalina/session/StandardSession.java
index 81803a9d1c..bf2c944afd 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -623,11 +623,11 @@ public class StandardSession implements HttpSession,
Session, Serializable {
@Override
public Accessor getAccessor() {
- if (!isValidInternal()) {
- throw new
IllegalStateException(sm.getString("standardSession.getAccessor.ise"));
- }
+if (!isValidInternal()) {
+throw new
IllegalStateException(sm.getString("standardSession.getAccessor.ise"));
+}
- return new StandardSessionAccessor(getManager(), getId());
+return new StandardSessionAccessor(getManager(), getId());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix indent
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 14db2cf718 Fix indent 14db2cf718 is described below commit 14db2cf718054d4d1e0b2937bc3abe023782c485 Author: Mark Thomas AuthorDate: Thu Jan 5 09:48:25 2023 + Fix indent --- webapps/docs/changelog.xml | 21 ++--- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 15bbb604e6..dd17930424 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -158,17 +158,16 @@ - - - 66370: Change the default of the - org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED system - property to true unless the EL library is running on - Tomcat in which case the default remains false as the - EL library is already called from within a privileged block and - skipping the unnecessary privileged block improves performance. - (markt) - - + + +66370: Change the default of the +org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED system +property to true unless the EL library is running on Tomcat +in which case the default remains false as the EL library +is already called from within a privileged block and skipping the +unnecessary privileged block improves performance. (markt) + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix indent and small bits of other formatting. No functional change.
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 0c94180081 Fix indent and small bits of other formatting. No
functional change.
0c94180081 is described below
commit 0c94180081bddad56158374b58bcb326646ae172
Author: Mark Thomas
AuthorDate: Fri Jun 17 19:13:53 2022 +0100
Fix indent and small bits of other formatting. No functional change.
Fixes the jakarta.* packages
---
java/jakarta/ejb/EJBs.java | 2 +-
java/jakarta/persistence/PersistenceContexts.java | 2 +-
java/jakarta/persistence/PersistenceUnits.java | 2 +-
java/jakarta/servlet/AsyncContext.java | 3 +-
java/jakarta/servlet/jsp/HttpJspPage.java | 2 +-
java/jakarta/servlet/jsp/el/ELParseException.java | 36 --
java/jakarta/servlet/jsp/el/FunctionMapper.java| 19 +-
.../servlet/jsp/el/ImplicitObjectELResolver.java | 44 +++---
java/jakarta/servlet/jsp/tagext/PageData.java | 2 +-
java/jakarta/servlet/jsp/tagext/TagInfo.java | 31 ++-
10 files changed, 65 insertions(+), 78 deletions(-)
diff --git a/java/jakarta/ejb/EJBs.java b/java/jakarta/ejb/EJBs.java
index 28a6b7f8fd..5f2647cb17 100644
--- a/java/jakarta/ejb/EJBs.java
+++ b/java/jakarta/ejb/EJBs.java
@@ -25,5 +25,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface EJBs {
- EJB[] value();
+EJB[] value();
}
diff --git a/java/jakarta/persistence/PersistenceContexts.java
b/java/jakarta/persistence/PersistenceContexts.java
index 2a67d51729..671d117c7c 100644
--- a/java/jakarta/persistence/PersistenceContexts.java
+++ b/java/jakarta/persistence/PersistenceContexts.java
@@ -25,5 +25,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceContexts {
- PersistenceContext[] value();
+PersistenceContext[] value();
}
diff --git a/java/jakarta/persistence/PersistenceUnits.java
b/java/jakarta/persistence/PersistenceUnits.java
index e73860d275..3da4da578e 100644
--- a/java/jakarta/persistence/PersistenceUnits.java
+++ b/java/jakarta/persistence/PersistenceUnits.java
@@ -25,5 +25,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceUnits {
- PersistenceUnit[] value();
+PersistenceUnit[] value();
}
diff --git a/java/jakarta/servlet/AsyncContext.java
b/java/jakarta/servlet/AsyncContext.java
index 80ff5fafa3..859475dfe7 100644
--- a/java/jakarta/servlet/AsyncContext.java
+++ b/java/jakarta/servlet/AsyncContext.java
@@ -150,8 +150,7 @@ public interface AsyncContext {
* @return the newly created AsyncListener object
* @throws ServletException if the listener cannot be created
*/
- T createListener(Class clazz)
-throws ServletException;
+ T createListener(Class clazz) throws
ServletException;
/**
* Set the timeout.
diff --git a/java/jakarta/servlet/jsp/HttpJspPage.java
b/java/jakarta/servlet/jsp/HttpJspPage.java
index dab56523e6..145b12c57e 100644
--- a/java/jakarta/servlet/jsp/HttpJspPage.java
+++ b/java/jakarta/servlet/jsp/HttpJspPage.java
@@ -55,5 +55,5 @@ public interface HttpJspPage extends JspPage {
*/
public void _jspService(HttpServletRequest request,
HttpServletResponse response)
- throws ServletException, IOException;
+throws ServletException, IOException;
}
diff --git a/java/jakarta/servlet/jsp/el/ELParseException.java
b/java/jakarta/servlet/jsp/el/ELParseException.java
index 72a7ef1700..a79fad0fbc 100644
--- a/java/jakarta/servlet/jsp/el/ELParseException.java
+++ b/java/jakarta/servlet/jsp/el/ELParseException.java
@@ -26,27 +26,23 @@ package jakarta.servlet.jsp.el;
@Deprecated
public class ELParseException extends ELException {
- private static final long serialVersionUID = 1L;
+private static final long serialVersionUID = 1L;
-//-
- /**
- * Creates an ELParseException with no detail message.
- */
- public ELParseException ()
- {
-super ();
- }
- //-
- /**
- * Creates an ELParseException with the provided detail message.
- *
- * @param pMessage the detail message
- **/
- public ELParseException (String pMessage)
- {
-super (pMessage);
- }
+/**
+ * Creates an ELParseException with no detail message.
+ */
+public ELParseException () {
+super ();
+}
- //-
+
+/**
+ * Creates an ELParseException with the provided detail message.
+ *
+ * @param pMessage the detail message
+ */
+public ELParseException (String pMessage) {
+super (pMessage);
+}
}
diff --git a/java/jakarta/servlet/jsp/el/Fun
[tomcat] branch main updated: Fix indent
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 d872f1eeac Fix indent
d872f1eeac is described below
commit d872f1eeac24d946cc04d989bc8abfd4d4089cee
Author: Mark Thomas
AuthorDate: Tue May 24 18:58:21 2022 +0100
Fix indent
---
java/org/apache/tomcat/jni/SSL.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/tomcat/jni/SSL.java
b/java/org/apache/tomcat/jni/SSL.java
index 06b6090111..316e6182e3 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -343,7 +343,7 @@ public final class SSL {
* @return New BIO handle
* @throws Exception An error occurred
*/
- public static native long newBIO(long pool, BIOCallback callback)
+public static native long newBIO(long pool, BIOCallback callback)
throws Exception;
/**
@@ -351,19 +351,19 @@ public final class SSL {
* @param bio BIO to close and destroy.
* @return APR Status code
*/
- public static native int closeBIO(long bio);
+public static native int closeBIO(long bio);
/**
* Set global Password callback for obtaining passwords.
* @param callback PasswordCallback implementation to use.
*/
- public static native void setPasswordCallback(PasswordCallback callback);
+public static native void setPasswordCallback(PasswordCallback callback);
/**
* Set global Password for decrypting certificates and keys.
* @param password Password to use.
*/
- public static native void setPassword(String password);
+public static native void setPassword(String password);
/**
* Return last SSL error string
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix indent
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 c351821 Fix indent
c351821 is described below
commit c3518215621e08e8b1a8afac2f1e6c4c73ef1218
Author: Mark Thomas
AuthorDate: Mon Feb 21 16:25:18 2022 +
Fix indent
---
build.xml | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/build.xml b/build.xml
index 9aef252..54cd5fd 100644
--- a/build.xml
+++ b/build.xml
@@ -2590,11 +2590,11 @@ skip.installer property in build.properties" />
description="Builds and optionally signs the Windows installer"
depends="-installer,setup-jsign" if="${do.codesigning}" >
http://timestamp.digicert.com"/>
+storepass="${codesigning.storepass}"
+storetype="${codesigning.storetype}"
+alias="${codesigning.alias}"
+alg="${codesigning.digest}"
+tsaurl="http://timestamp.digicert.com"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
