[tomcat] branch 7.0.x updated: Prep fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63781

2019-10-03 Thread markt
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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new f187e83  Prep fix for 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63781
f187e83 is described below

commit f187e83c6f007e2f5957697d3ae74ec2263db172
Author: Mark Thomas 
AuthorDate: Thu Oct 3 19:02:00 2019 +0100

Prep fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63781

Add canAccess to JreCompat and create cut-down version of JreCompat for
EL API implementation.
---
 java/javax/el/Jre9Compat.java  | 56 
 java/javax/el/JreCompat.java   | 60 ++
 java/org/apache/tomcat/util/compat/Jre9Compat.java | 21 +++-
 java/org/apache/tomcat/util/compat/JreCompat.java  | 20 
 4 files changed, 156 insertions(+), 1 deletion(-)

diff --git a/java/javax/el/Jre9Compat.java b/java/javax/el/Jre9Compat.java
new file mode 100644
index 000..55110cd
--- /dev/null
+++ b/java/javax/el/Jre9Compat.java
@@ -0,0 +1,56 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package javax.el;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+class Jre9Compat extends JreCompat {
+
+private static final Method canAccessMethod;
+
+
+static {
+Method m1 = null;
+try {
+m1 = AccessibleObject.class.getMethod("canAccess", new Class[] 
{ Object.class });
+} catch (NoSuchMethodException e) {
+// Expected for Java 8
+}
+canAccessMethod = m1;
+}
+
+
+public static boolean isSupported() {
+return canAccessMethod != null;
+}
+
+
+@Override
+public boolean canAcccess(Class type, Object base, AccessibleObject 
accessibleObject) {
+try {
+return ((Boolean) canAccessMethod.invoke(accessibleObject, 
base)).booleanValue();
+} catch (IllegalArgumentException e) {
+return false;
+} catch (IllegalAccessException e) {
+return false;
+} catch (InvocationTargetException e) {
+return false;
+}
+}
+}
diff --git a/java/javax/el/JreCompat.java b/java/javax/el/JreCompat.java
new file mode 100644
index 000..b01d94e
--- /dev/null
+++ b/java/javax/el/JreCompat.java
@@ -0,0 +1,60 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package javax.el;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Modifier;
+
+/*
+ * This is cut down version of org.apache.tomcat.util.JreCompat that provides
+ * only the methods required by the EL implementation.
+ */
+class JreCompat {
+
+private static final JreCompat instance;
+
+static {
+if (Jre9Compat.isSupported()) {
+instance = new Jre9Compat();
+} else {
+instance = new JreCompat();
+}
+}
+
+
+public static JreCompat getInstance() {
+return instance;
+}
+
+
+/**
+ * Is the accessibleObject of the given type accessible on the provided
+ * instance of that type.
+ *
+ * @param type  The type the accessible object belongs to
+ * @param base  The specific instance of the type to be tested. Unused 
prior
+ *  to Java 9.
+

[tomcat] branch 8.5.x updated: Prep fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63781

2019-10-03 Thread markt
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new b5d2660  Prep fix for 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63781
b5d2660 is described below

commit b5d266044a749b0e42a3e9aa51fe1722c0431e2e
Author: Mark Thomas 
AuthorDate: Thu Oct 3 19:02:00 2019 +0100

Prep fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63781

Add canAccess to JreCompat and create cut-down version of JreCompat for
EL API implementation.
---
 java/javax/el/Jre9Compat.java  | 51 ++
 java/javax/el/JreCompat.java   | 60 ++
 java/org/apache/tomcat/util/compat/Jre9Compat.java | 17 +-
 java/org/apache/tomcat/util/compat/JreCompat.java  | 20 
 4 files changed, 147 insertions(+), 1 deletion(-)

diff --git a/java/javax/el/Jre9Compat.java b/java/javax/el/Jre9Compat.java
new file mode 100644
index 000..e1b75a7
--- /dev/null
+++ b/java/javax/el/Jre9Compat.java
@@ -0,0 +1,51 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package javax.el;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Method;
+
+class Jre9Compat extends JreCompat {
+
+private static final Method canAccessMethod;
+
+
+static {
+Method m1 = null;
+try {
+m1 = AccessibleObject.class.getMethod("canAccess", new Class[] 
{ Object.class });
+} catch (NoSuchMethodException e) {
+// Expected for Java 8
+}
+canAccessMethod = m1;
+}
+
+
+public static boolean isSupported() {
+return canAccessMethod != null;
+}
+
+
+@Override
+public boolean canAcccess(Class type, Object base, AccessibleObject 
accessibleObject) {
+try {
+return ((Boolean) canAccessMethod.invoke(accessibleObject, 
base)).booleanValue();
+} catch (ReflectiveOperationException | IllegalArgumentException e) {
+return false;
+}
+}
+}
diff --git a/java/javax/el/JreCompat.java b/java/javax/el/JreCompat.java
new file mode 100644
index 000..b01d94e
--- /dev/null
+++ b/java/javax/el/JreCompat.java
@@ -0,0 +1,60 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package javax.el;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Modifier;
+
+/*
+ * This is cut down version of org.apache.tomcat.util.JreCompat that provides
+ * only the methods required by the EL implementation.
+ */
+class JreCompat {
+
+private static final JreCompat instance;
+
+static {
+if (Jre9Compat.isSupported()) {
+instance = new Jre9Compat();
+} else {
+instance = new JreCompat();
+}
+}
+
+
+public static JreCompat getInstance() {
+return instance;
+}
+
+
+/**
+ * Is the accessibleObject of the given type accessible on the provided
+ * instance of that type.
+ *
+ * @param type  The type the accessible object belongs to
+ * @param base  The specific instance of the type to be tested. Unused 
prior
+ *  to Java 9.
+ * @param accessibleObject  The method/field/constructor to be tested.
+ *  Unused prior to Java 9.
+ *
+ * @return {code true} if the 

[tomcat] branch master updated: Prep fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63781

2019-10-03 Thread markt
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 c7596e5  Prep fix for 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63781
c7596e5 is described below

commit c7596e5f2485c3ab627402fa971505d1fbe18def
Author: Mark Thomas 
AuthorDate: Thu Oct 3 19:02:00 2019 +0100

Prep fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63781

Add canAccess to JreCompat and create cut-down version of JreCompat for
EL API implementation.
---
 java/javax/el/Jre9Compat.java  | 51 ++
 java/javax/el/JreCompat.java   | 60 ++
 java/org/apache/tomcat/util/compat/Jre9Compat.java | 17 +-
 java/org/apache/tomcat/util/compat/JreCompat.java  | 20 
 4 files changed, 147 insertions(+), 1 deletion(-)

diff --git a/java/javax/el/Jre9Compat.java b/java/javax/el/Jre9Compat.java
new file mode 100644
index 000..e1b75a7
--- /dev/null
+++ b/java/javax/el/Jre9Compat.java
@@ -0,0 +1,51 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package javax.el;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Method;
+
+class Jre9Compat extends JreCompat {
+
+private static final Method canAccessMethod;
+
+
+static {
+Method m1 = null;
+try {
+m1 = AccessibleObject.class.getMethod("canAccess", new Class[] 
{ Object.class });
+} catch (NoSuchMethodException e) {
+// Expected for Java 8
+}
+canAccessMethod = m1;
+}
+
+
+public static boolean isSupported() {
+return canAccessMethod != null;
+}
+
+
+@Override
+public boolean canAcccess(Class type, Object base, AccessibleObject 
accessibleObject) {
+try {
+return ((Boolean) canAccessMethod.invoke(accessibleObject, 
base)).booleanValue();
+} catch (ReflectiveOperationException | IllegalArgumentException e) {
+return false;
+}
+}
+}
diff --git a/java/javax/el/JreCompat.java b/java/javax/el/JreCompat.java
new file mode 100644
index 000..b01d94e
--- /dev/null
+++ b/java/javax/el/JreCompat.java
@@ -0,0 +1,60 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package javax.el;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Modifier;
+
+/*
+ * This is cut down version of org.apache.tomcat.util.JreCompat that provides
+ * only the methods required by the EL implementation.
+ */
+class JreCompat {
+
+private static final JreCompat instance;
+
+static {
+if (Jre9Compat.isSupported()) {
+instance = new Jre9Compat();
+} else {
+instance = new JreCompat();
+}
+}
+
+
+public static JreCompat getInstance() {
+return instance;
+}
+
+
+/**
+ * Is the accessibleObject of the given type accessible on the provided
+ * instance of that type.
+ *
+ * @param type  The type the accessible object belongs to
+ * @param base  The specific instance of the type to be tested. Unused 
prior
+ *  to Java 9.
+ * @param accessibleObject  The method/field/constructor to be tested.
+ *  Unused prior to Java 9.
+ *
+ * @return {code true} if 

[Bug 60461] SIGSEGV in SSLSocket.getInfos

2019-10-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60461

--- Comment #39 from mattk  ---
Is it known whether this bug was introduced in 8.5.x?  Or did it also exist in
8.0.x or 7.0.x?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Remove unused code

2019-10-03 Thread markt
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 7bbc448  Remove unused code
7bbc448 is described below

commit 7bbc448bb71906038ae61cd2fc8e89631a15823b
Author: Mark Thomas 
AuthorDate: Thu Oct 3 17:15:09 2019 +0100

Remove unused code
---
 java/org/apache/tomcat/util/net/NioEndpoint.java  | 2 +-
 java/org/apache/tomcat/util/net/SecureNioChannel.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index c23bfc9..150bcf5 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -410,7 +410,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 socketProperties.getAppWriteBufSize(),
 socketProperties.getDirectBuffer());
 if (isSSLEnabled()) {
-channel = new SecureNioChannel(socket, bufhandler, 
selectorPool, this);
+channel = new SecureNioChannel(bufhandler, selectorPool, 
this);
 } else {
 channel = new NioChannel(bufhandler);
 }
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java 
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index 4c4c85a..7d128fb 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -70,8 +70,7 @@ public class SecureNioChannel extends NioChannel {
 
 protected NioSelectorPool pool;
 
-public SecureNioChannel(SocketChannel channel, SocketBufferHandler 
bufHandler,
-NioSelectorPool pool, NioEndpoint endpoint) {
+public SecureNioChannel(SocketBufferHandler bufHandler, NioSelectorPool 
pool, NioEndpoint endpoint) {
 super(bufHandler);
 
 // Create the network buffers (these hold the encrypted data).


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



[tomcat] branch 7.0.x updated: Remove unused code

2019-10-03 Thread markt
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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new e0ffdc8  Remove unused code
e0ffdc8 is described below

commit e0ffdc8140a5b5019aab3266b2f7952c81abff91
Author: Mark Thomas 
AuthorDate: Thu Oct 3 17:04:49 2019 +0100

Remove unused code
---
 java/javax/el/BeanELResolver.java | 12 
 1 file changed, 12 deletions(-)

diff --git a/java/javax/el/BeanELResolver.java 
b/java/javax/el/BeanELResolver.java
index 78cfd4c..cd1a111 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -274,10 +274,6 @@ public class BeanELResolver extends ELResolver {
 return property;
 }
 
-public BeanProperty getBeanProperty(String name) {
-return get(null, name);
-}
-
 private Class getType() {
 return type;
 }
@@ -309,14 +305,6 @@ public class BeanELResolver extends ELResolver {
 (null == (this.write = Util.getMethod(this.owner, 
descriptor.getWriteMethod(;
 }
 
-public Method getWriteMethod() {
-return write(null);
-}
-
-public Method getReadMethod() {
-return this.read(null);
-}
-
 private Method write(ELContext ctx) {
 if (this.write == null) {
 this.write = Util.getMethod(this.owner, 
descriptor.getWriteMethod());


-
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: Remove unused code

2019-10-03 Thread markt
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 260133b  Remove unused code
260133b is described below

commit 260133bec9442911da270ddfe39b287a6c6a8c00
Author: Mark Thomas 
AuthorDate: Thu Oct 3 17:04:49 2019 +0100

Remove unused code
---
 java/javax/el/BeanELResolver.java | 12 
 1 file changed, 12 deletions(-)

diff --git a/java/javax/el/BeanELResolver.java 
b/java/javax/el/BeanELResolver.java
index e4fa72a..c69798f 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -263,10 +263,6 @@ public class BeanELResolver extends ELResolver {
 return property;
 }
 
-public BeanProperty getBeanProperty(String name) {
-return get(null, name);
-}
-
 private Class getType() {
 return type;
 }
@@ -298,14 +294,6 @@ public class BeanELResolver extends ELResolver {
 (null == (this.write = Util.getMethod(this.owner, 
descriptor.getWriteMethod(;
 }
 
-public Method getWriteMethod() {
-return write(null);
-}
-
-public Method getReadMethod() {
-return this.read(null);
-}
-
 private Method write(ELContext ctx) {
 if (this.write == null) {
 this.write = Util.getMethod(this.owner, 
descriptor.getWriteMethod());


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



[tomcat] branch master updated: Remove unused code

2019-10-03 Thread markt
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 05a85a7  Remove unused code
05a85a7 is described below

commit 05a85a79dccb24fb2b34cafdc8a554c72b431cf7
Author: Mark Thomas 
AuthorDate: Thu Oct 3 17:04:49 2019 +0100

Remove unused code
---
 java/javax/el/BeanELResolver.java | 12 
 1 file changed, 12 deletions(-)

diff --git a/java/javax/el/BeanELResolver.java 
b/java/javax/el/BeanELResolver.java
index e4fa72a..c69798f 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -263,10 +263,6 @@ public class BeanELResolver extends ELResolver {
 return property;
 }
 
-public BeanProperty getBeanProperty(String name) {
-return get(null, name);
-}
-
 private Class getType() {
 return type;
 }
@@ -298,14 +294,6 @@ public class BeanELResolver extends ELResolver {
 (null == (this.write = Util.getMethod(this.owner, 
descriptor.getWriteMethod(;
 }
 
-public Method getWriteMethod() {
-return write(null);
-}
-
-public Method getReadMethod() {
-return this.read(null);
-}
-
 private Method write(ELContext ctx) {
 if (this.write == null) {
 this.write = Util.getMethod(this.owner, 
descriptor.getWriteMethod());


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



[tomcat] branch 7.0.x updated: Remove unnecessary @SuppressWarnings

2019-10-03 Thread markt
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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 71bcaa3  Remove unnecessary @SuppressWarnings
71bcaa3 is described below

commit 71bcaa3be2cd91b6cc26995b2c2ef238a7db150e
Author: Mark Thomas 
AuthorDate: Thu Oct 3 16:54:01 2019 +0100

Remove unnecessary @SuppressWarnings
---
 java/javax/el/BeanELResolver.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/javax/el/BeanELResolver.java 
b/java/javax/el/BeanELResolver.java
index 6ad6af1..78cfd4c 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -300,9 +300,7 @@ public class BeanELResolver extends ELResolver {
 this.type = descriptor.getPropertyType();
 }
 
-// Can't use Class because API needs to match specification
-@SuppressWarnings("rawtypes")
-public Class getPropertyType() {
+public Class getPropertyType() {
 return this.type;
 }
 


-
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: Remove unnecessary @SuppressWarnings

2019-10-03 Thread markt
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 7637860  Remove unnecessary @SuppressWarnings
7637860 is described below

commit 7637860b10858acc4eadb3a00f05270b1fb05c56
Author: Mark Thomas 
AuthorDate: Thu Oct 3 16:54:01 2019 +0100

Remove unnecessary @SuppressWarnings
---
 java/javax/el/BeanELResolver.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/javax/el/BeanELResolver.java 
b/java/javax/el/BeanELResolver.java
index 9372854..e4fa72a 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -289,9 +289,7 @@ public class BeanELResolver extends ELResolver {
 this.type = descriptor.getPropertyType();
 }
 
-// Can't use Class because API needs to match specification
-@SuppressWarnings("rawtypes")
-public Class getPropertyType() {
+public Class getPropertyType() {
 return this.type;
 }
 


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



[tomcat] branch master updated: Remove unnecessary @SuppressWarnings

2019-10-03 Thread markt
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 e220150  Remove unnecessary @SuppressWarnings
e220150 is described below

commit e2201508e0327eaf7946c3e5193b6ee966196a37
Author: Mark Thomas 
AuthorDate: Thu Oct 3 16:54:01 2019 +0100

Remove unnecessary @SuppressWarnings
---
 java/javax/el/BeanELResolver.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/javax/el/BeanELResolver.java 
b/java/javax/el/BeanELResolver.java
index 9372854..e4fa72a 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -289,9 +289,7 @@ public class BeanELResolver extends ELResolver {
 this.type = descriptor.getPropertyType();
 }
 
-// Can't use Class because API needs to match specification
-@SuppressWarnings("rawtypes")
-public Class getPropertyType() {
+public Class getPropertyType() {
 return this.type;
 }
 


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



[tomcat] branch master updated: Update to Apache CXF 3.3.3

2019-10-03 Thread remm
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 64b0a98  Update to Apache CXF 3.3.3
64b0a98 is described below

commit 64b0a9874fc88fa89ae6bbaacc55f91de48e3878
Author: remm 
AuthorDate: Thu Oct 3 17:30:29 2019 +0200

Update to Apache CXF 3.3.3
---
 modules/cxf/pom.xml| 4 ++--
 webapps/docs/changelog.xml | 5 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index b6f5148..814789b 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -29,14 +29,14 @@
 Apache CXF for Apache Tomcat CDI
 Apache CXF packaged for Apache Tomcat CDI
 
-3.3.2
+3.3.3
 jar
 
 
 1.0.1
 1.1.4
 1.0
-1.1.12
+1.2.1
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fc230d0..24c5b0d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,7 +133,10 @@
 the minimum supported Java version. (markt)
   
   
-Update to OpenWebBeans 2.0.12. (remm)
+Update the OWB module to Apache OpenWebBeans 2.0.12. (remm)
+  
+  
+Update the CXF module to Apache CXF 3.3.3. (remm)
   
 
   


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



[tomcat] branch master updated: Update to OpenWebBeans 2.0.12

2019-10-03 Thread remm
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 ec86527  Update to OpenWebBeans 2.0.12
ec86527 is described below

commit ec86527544650294068279316e26e00a987f3e13
Author: remm 
AuthorDate: Thu Oct 3 17:18:44 2019 +0200

Update to OpenWebBeans 2.0.12

Prepare to use shade 3.2.2 whenever it is released.
---
 modules/owb/pom.xml | 6 --
 .../main/resources/META-INF/openwebbeans/openwebbeans.properties| 2 ++
 webapps/docs/changelog.xml  | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 55d25b9..88328d3 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -29,14 +29,14 @@
 Apache Tomcat CDI 2 support
 Apache Tomcat CDI 2 support using Apache 
OpenWebBeans
 
-2.0.10
+2.0.12
 jar
 
 
 1.0
 1.0
 1.0.1
-9.0.21
+9.0.26
 
 
 
@@ -96,6 +96,7 @@
 org.apache.maven.plugins
 maven-shade-plugin
 3.0.0
+
 
 
 package
@@ -105,6 +106,7 @@
 
 
false
 
+
 
 ${mainClass}
 
diff --git 
a/modules/owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties 
b/modules/owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
index fa5a3fb..b1d0ae4 100644
--- 
a/modules/owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
+++ 
b/modules/owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
@@ -16,6 +16,8 @@
 #under the License.
 
 
org.apache.webbeans.spi.SecurityService=org.apache.webbeans.web.tomcat.TomcatSecurityService
+
+# Remove if using shade 3.2.2 and OpenWebBeansPropertiesTransformer
 org.apache.webbeans.spi.adaptor.ELAdaptor=org.apache.webbeans.el22.EL22Adaptor
 
org.apache.webbeans.spi.ContainerLifecycle=org.apache.webbeans.web.lifecycle.WebContainerLifecycle
 
org.apache.webbeans.spi.ScannerService=org.apache.webbeans.web.scanner.WebScannerService
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4ed78e0..fc230d0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -132,6 +132,9 @@
 use that build property to reduce the number of edits required to 
update
 the minimum supported Java version. (markt)
   
+  
+Update to OpenWebBeans 2.0.12. (remm)
+  
 
   
 


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



svn commit: r1867949 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml

2019-10-03 Thread jfclere
Author: jfclere
Date: Thu Oct  3 15:17:46 2019
New Revision: 1867949

URL: http://svn.apache.org/viewvc?rev=1867949=rev
Log:
Add my slides.

Modified:
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/xdocs/presentations.xml

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1867949=1867948=1867949=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Thu Oct  3 15:17:46 2019
@@ -1,949 +1,936 @@
 
 
-
-
-
-
-
-Apache Tomcat - Presentations
-
-
-
-
-
-
-
-
-http://tomcat.apache.org/;>
-
-Apache Tomcat
-
-
-https://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" 
class="pull-left">
-
-
-
-
-
-
-
-https://www.google.com/search; 
method="get">
-
-GO
-
-
-
-https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
-
-  Save the date!
+
+
+
+
+
+Apache Tomcat - Presentations
+
+
+
+
+
+
+
+
+http://tomcat.apache.org/;>
+Apache Tomcat
+
+
+https://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" 
class="pull-left">
+
+
+
+
+
+
+
+https://www.google.com/search; method="get">
+
+GO
+
+
+
+https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
+  Save the date!
 
-
-
-
-Apache Tomcat
-
-
-Home
-
-
-Taglibs
-
-
-Maven Plugin
-
-
-
-
-Download
-
-
-Which version?
-
-
-https://tomcat.apache.org/download-90.cgi;>Tomcat 9
-
-
-https://tomcat.apache.org/download-80.cgi;>Tomcat 8
-
-
-https://tomcat.apache.org/download-70.cgi;>Tomcat 7
-
-
-https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors
-
-
-https://tomcat.apache.org/download-native.cgi;>Tomcat Native
-
-
-https://tomcat.apache.org/download-taglibs.cgi;>Taglibs
-
-
-https://archive.apache.org/dist/tomcat/;>Archives
-
-
-
-
-Documentation
-
-
-  

[Bug 63781] Prevent illegal reflective access warnings / errors from BeanELResolver

2019-10-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63781

--- Comment #1 from Mark Thomas  ---
Created attachment 36807
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36807=edit
Draft patch

The fix for this is rather more involved than it might first appear.

The check in Java is AccessibleObject.canAccess(Object) but that is a new
method in Java 9 and the EL API (and implementation) have to work on Java 8.
That means introducing a cut-down version of JreCompat into the EL API.

There are a further 9 places in EL API where Modifiers.isPublic() is called.
Each of those also need to be checked to see if a similar change is required
there. As do the 7 places it is called elsewhere in the Tomcat code base.

I've attached a draft patch that addresses the specific issue raised in this
report for review / comment. I intend to use this as the basis for a broader,
more complete patch.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 63685] WebappClassLoaderBase and StandardRoot reload classes from jar files on each call of getResource, getResourceAsStream and etc. that hit application startup performance

2019-10-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63685

Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |WONTFIX

--- Comment #5 from Mark Thomas  ---
This issue has been open for more than a month waiting for a use case that
requires the caching of class files. None has been provided so I am closing
this as WONTFIX.

Feel free to re-open this with an explanation of why this feature is required
if you have such a use case

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Move handler release code to the superclass

2019-10-03 Thread remm
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 0eaa09a  Move handler release code to the superclass
0eaa09a is described below

commit 0eaa09a90c657f4a461c7adeff4e69b6ac9c032c
Author: remm 
AuthorDate: Thu Oct 3 10:32:06 2019 +0200

Move handler release code to the superclass

No idea why I didn't notice it earlier since it's quite obvious.
---
 java/org/apache/tomcat/util/net/AprEndpoint.java   | 8 
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  | 8 
 java/org/apache/tomcat/util/net/NioEndpoint.java   | 8 
 java/org/apache/tomcat/util/net/SocketWrapperBase.java | 8 
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index bd7149d..3f9cb3b 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2244,14 +2244,6 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 if (log.isDebugEnabled()) {
 log.debug("Calling [" + getEndpoint() + "].closeSocket([" + 
this + "])", new Exception());
 }
-try {
-getEndpoint().getHandler().release(this);
-} catch (Throwable e) {
-ExceptionUtils.handleThrowable(e);
-if (log.isDebugEnabled()) {
-log.error(sm.getString("endpoint.debug.handlerRelease"), 
e);
-}
-}
 socketBufferHandler = SocketBufferHandler.EMPTY;
 nonBlockingWriteBuffer.clear();
 synchronized (closed) {
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 0ff7c4f..4bb8ba1 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -915,14 +915,6 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint
 log.debug("Calling [" + getEndpoint() + "].closeSocket([" + 
this + "])", new Exception());
 }
 try {
-getEndpoint().getHandler().release(this);
-} catch (Throwable e) {
-ExceptionUtils.handleThrowable(e);
-if (log.isDebugEnabled()) {
-log.error(sm.getString("endpoint.debug.handlerRelease"), 
e);
-}
-}
-try {
 synchronized (getSocket()) {
 getEndpoint().countDownConnection();
 if (getSocket().isOpen()) {
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index d4af16b..2c082d6 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -391,6 +391,14 @@ public abstract class SocketWrapperBase {
  */
 public void close() {
 if (closed.compareAndSet(false, true)) {
+try {
+getEndpoint().getHandler().release(this);
+} catch (Throwable e) {
+ExceptionUtils.handleThrowable(e);
+if (log.isDebugEnabled()) {
+log.error(sm.getString("endpoint.debug.handlerRelease"), 
e);
+}
+}
 doClose();
 }
 }


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