January 2013 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r2154 - branches/7.2.x/webapps/docs/config.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-24 12:11:23 -0500 (Thu, 24 Jan 2013) New Revision: 2154 Modified: branches/7.2.x/webapps/docs/config/http.xml Log: Arrange the NIO2 connector information. Modified: branches/7.2.x/webapps/docs/config/http.xml =================================================================== --- branches/7.2.x/webapps/docs/config/http.xml 2013-01-22 17:25:15 UTC (rev 2153) +++ branches/7.2.x/webapps/docs/config/http.xml 2013-01-24 17:11:23 UTC (rev 2154) @@ -104,7 +104,8 @@ settings for HTTPS than the default Java connector. Other values for this attribute are, but not limited to: <code>org.apache.coyote.http11.Http11Protocol</code> - same as HTTP/1.1 - <code>org.apache.coyote.http11.Http11NioProtocol</code> - non blocking Java connector, not supported in JBossWeb + <code>org.apache.coyote.http11.Http11NioProtocol</code> - non blocking Java connector, note that it require java7 and that is not based + on the NIO1 connector of the ASF Tomcat but uses NIO2 <code>org.apache.coyote.http11.Http11AprProtocol</code> - the APR connector. The configuration for both Java connectors are identical, both for http and https. For more information on the APR connector and APR specific SSL settings please

11 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2153 - in branches/7.2.x: src/main/java/org/apache/catalina/core and 1 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-01-22 12:25:15 -0500 (Tue, 22 Jan 2013) New Revision: 2153 Modified: branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java branches/7.2.x/webapps/docs/changelog.xml Log: JBWEB-260: Fix state of async context after executing a runnable, since it is allowed to do something like a dispatch after it [which I did miss]. Modified: branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java 2013-01-21 18:47:40 UTC (rev 2152) +++ branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java 2013-01-22 17:25:15 UTC (rev 2153) @@ -3436,6 +3436,12 @@ return runnable; } + public Runnable runRunnable() { + Runnable result = runnable; + runnable = null; + return result; + } + public void reset() { servletContext = null; path = null; Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java 2013-01-21 18:47:40 UTC (rev 2152) +++ branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java 2013-01-22 17:25:15 UTC (rev 2153) @@ -544,7 +544,7 @@ } else if (asyncContext.getRunnable() != null) { // Execute the runnable try { - asyncContext.getRunnable().run(); + asyncContext.runRunnable().run(); } catch (Throwable e) { container.getLogger().error(MESSAGES.asyncRunnableError(getContainer().getName()), e); asyncContext.setError(e); Modified: branches/7.2.x/webapps/docs/changelog.xml =================================================================== --- branches/7.2.x/webapps/docs/changelog.xml 2013-01-21 18:47:40 UTC (rev 2152) +++ branches/7.2.x/webapps/docs/changelog.xml 2013-01-22 17:25:15 UTC (rev 2153) @@ -17,6 +17,16 @@ <body> <section name="JBoss Web 7.2.0.Beta2 (remm)"> + <subsection name="Catalina"> + <changelog> + <fix> + <jira>260</jira>: Async dispatching after executing a runnable should be possible. (remm) + </fix> + <fix> + <jboss-jira>AS7-5802</jboss-jira>: Fix problem with duplicated filter instantiation when using a filter registration. (remm) + </fix> + </changelog> + </subsection> <subsection name="Jasper"> <changelog> <fix>

11 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2152 - in branches/JBOSSWEB_7_0_17_FINAL_BZ-902421: test and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2013-01-21 13:47:40 -0500 (Mon, 21 Jan 2013) New Revision: 2152 Modified: branches/JBOSSWEB_7_0_17_FINAL_BZ-902421/java/org/apache/el/util/ReflectionUtil.java branches/JBOSSWEB_7_0_17_FINAL_BZ-902421/test/build.properties.default Log: [BZ-902421] committing fix backported from AS7-3177 Modified: branches/JBOSSWEB_7_0_17_FINAL_BZ-902421/java/org/apache/el/util/ReflectionUtil.java =================================================================== --- branches/JBOSSWEB_7_0_17_FINAL_BZ-902421/java/org/apache/el/util/ReflectionUtil.java 2013-01-21 16:28:13 UTC (rev 2151) +++ branches/JBOSSWEB_7_0_17_FINAL_BZ-902421/java/org/apache/el/util/ReflectionUtil.java 2013-01-21 18:47:40 UTC (rev 2152) @@ -250,7 +250,6 @@ return match; } - @SuppressWarnings("null") private static Method resolveAmbiguousMethod(Set<Method> candidates, Class<?>[] paramTypes) { // Identify which parameter isn't an exact match @@ -267,6 +266,11 @@ } } + if (nonMatchClass == null) { + // Null will always be ambiguous + return null; + } + for (Method c : candidates) { if (c.getParameterTypes()[nonMatchIndex] == paramTypes[nonMatchIndex]) { @@ -294,6 +298,12 @@ // src will always be an object private static boolean isAssignableFrom(Class<?> src, Class<?> target) { + // Short-cut. null is always assignable to an object and in EL null + // can always be coerced to a valid value for a primitive + if (src == null) { + return true; + } + Class<?> targetClass; if (target.isPrimitive()) { if (target == Boolean.TYPE) { @@ -334,7 +344,11 @@ if (types != null) { StringBuilder sb = new StringBuilder(); for (int i = 0; i < types.length; i++) { - sb.append(types[i].getName()).append(", "); + if (types[i] == null) { + sb.append("null, "); + } else { + sb.append(types[i].getName()).append(", "); + } } if (sb.length() > 2) { sb.setLength(sb.length() - 2); Modified: branches/JBOSSWEB_7_0_17_FINAL_BZ-902421/test/build.properties.default =================================================================== --- branches/JBOSSWEB_7_0_17_FINAL_BZ-902421/test/build.properties.default 2013-01-21 16:28:13 UTC (rev 2151) +++ branches/JBOSSWEB_7_0_17_FINAL_BZ-902421/test/build.properties.default 2013-01-21 18:47:40 UTC (rev 2152) @@ -1,4 +1,5 @@ # junit stuff +base.path=/home/aaron/Desktop/code/deps/JBossWeb7.0 junit.version=4.10 junit.jar.loc=http://kent.dl.sourceforge.net/sourceforge/junit/junit-${ju... junit.jar=${base.path}/junit-${junit.version}/junit-${junit.version}.jar

11 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2151 - branches.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2013-01-21 11:28:13 -0500 (Mon, 21 Jan 2013) New Revision: 2151 Added: branches/JBOSSWEB_7_0_17_FINAL_BZ-902421/ Log: [BZ-902421] new one off patch branch for JBossWeb 7.0.17.FINAL

11 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2150 - branches/7.2.x/src/main/java/org/apache/tomcat/util/net.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-01-16 08:28:22 -0500 (Wed, 16 Jan 2013) New Revision: 2150 Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java Log: Mladen confirmed that many Windows platforms should be fine trying to create a big poller, XP class Windows should refuse over 1024 (which should then cause creation of multiple pollsets). Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2013-01-10 15:11:48 UTC (rev 2149) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2013-01-16 13:28:22 UTC (rev 2150) @@ -1423,11 +1423,6 @@ defaultPollerSize = (OS.IS_WIN32 || OS.IS_WIN64) ? (8 * 1024) : (32 * 1024); } } - if ((OS.IS_WIN32 || OS.IS_WIN64) && (defaultPollerSize > 1024)) { - // The maximum per poller to get reasonable performance is 1024 - // Adjust poller size so that it won't reach the limit - defaultPollerSize = 1024; - } actualPollerSize = defaultPollerSize; timeouts = new SocketTimeouts(defaultPollerSize);

11 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2149 - branches/7.2.x.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-01-10 10:11:48 -0500 (Thu, 10 Jan 2013) New Revision: 2149 Removed: branches/7.2.x/build.properties.default branches/7.2.x/build.xml Log: Nobody seems to like it here. Deleted: branches/7.2.x/build.properties.default =================================================================== --- branches/7.2.x/build.properties.default 2013-01-10 07:00:05 UTC (rev 2148) +++ branches/7.2.x/build.properties.default 2013-01-10 15:11:48 UTC (rev 2149) @@ -1,43 +0,0 @@ -# ----------------------------------------------------------------------------- -# build.properties.sample -# -# This is an example "build.properties" file, used to customize building -# JBoss Web for your local environment. It defines the location of all external -# modules that JBoss Web depends on. Copy this file to "build.properties" -# in the top-level source directory, and customize it as needed. -# -# $Id: build.properties.default 526202 2007-04-06 15:44:38Z remm $ -# ----------------------------------------------------------------------------- - -# ----- Version Control Flags ----- -version.major=7 -version.minor=2 -version.build=0 -version.patch=0 -version.tag=SNAPSHOT - -# ----- Default Base Path for Dependent Packages ----- -# Please note this path must be absolute, not relative, -# as it is referenced with different working directory -# contexts by the various build scripts. -base.path=/usr/share/java -#base.path=C:/path/to/the/repository -#base.path=/usr/local - -compile.source=1.6 -compile.target=1.6 -compile.debug=true - -base-commons.loc=http://archive.apache.org/dist/commons -base-tomcat.loc=http://archive.apache.org/dist/tomcat -base-sf.loc=http://downloads.sourceforge.net - -# ----- Eclipse JDT, version 3.2 or later ----- -jdt.home=${base.path}/plugins -jdt.lib=${jdt.home} -jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.7.0.v_B61.jar -jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/org.eclipse.jdt-3.7.zip - -jdt-src.home=${base.path}/eclipse/plugins -jdt-src.lib=${jdt.home} -jdt-src.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/eclipse-sourceBuild-srcIncluded-3.7.zip Deleted: branches/7.2.x/build.xml =================================================================== (Binary files differ)

11 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2147 - branches/2.1.x/java/org/apache/catalina/core.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2013-01-08 17:31:16 -0500 (Tue, 08 Jan 2013) New Revision: 2147 Modified: branches/2.1.x/java/org/apache/catalina/core/ApplicationFilterConfig.java branches/2.1.x/java/org/apache/catalina/core/LocalStrings.properties branches/2.1.x/java/org/apache/catalina/core/StandardContext.java Log: [JBWEB-257] backporting fix from 7.2.x branch Modified: branches/2.1.x/java/org/apache/catalina/core/ApplicationFilterConfig.java =================================================================== --- branches/2.1.x/java/org/apache/catalina/core/ApplicationFilterConfig.java 2013-01-08 14:40:54 UTC (rev 2146) +++ branches/2.1.x/java/org/apache/catalina/core/ApplicationFilterConfig.java 2013-01-08 22:31:16 UTC (rev 2147) @@ -256,15 +256,15 @@ if (this.filter != null) { - if (Globals.IS_SECURITY_ENABLED) { - try { + try { + if (Globals.IS_SECURITY_ENABLED) { SecurityUtil.doAsPrivilege("destroy", filter); - } catch(java.lang.Exception ex){ - context.getLogger().error("ApplicationFilterConfig.doAsPrivilege", ex); + SecurityUtil.remove(filter); + } else { + filter.destroy(); } - SecurityUtil.remove(filter); - } else { - filter.destroy(); + } catch(java.lang.Exception ex){ + context.getLogger().error("ApplicationFilterConfig.errorDestroyingFilter", ex); } if (!context.getIgnoreAnnotations()) { try { Modified: branches/2.1.x/java/org/apache/catalina/core/LocalStrings.properties =================================================================== --- branches/2.1.x/java/org/apache/catalina/core/LocalStrings.properties 2013-01-08 14:40:54 UTC (rev 2146) +++ branches/2.1.x/java/org/apache/catalina/core/LocalStrings.properties 2013-01-08 22:31:16 UTC (rev 2147) @@ -63,6 +63,7 @@ standardContext.filterMap.pattern=Invalid <url-pattern> {0} in filter mapping standardContext.filterStart=Exception starting filter {0} standardContext.filterStartFailed=Failed to start application Filters successfully +standardContext.filterStop=Exception stopping filter {0} standardContext.requestListener.requestInit=Exception sending request initialized lifecycle event to listener instance of class {0} standardContext.requestListener.requestDestroy=Exception sending request destroyed lifecycle event to listener instance of class {0} standardContext.requestListenerStartFailed=Failed to start request listener valve successfully @@ -199,4 +200,4 @@ defaultInstanceManager.privilegedServlet=Servlet of class {0} is privileged and cannot be loaded by this web application defaultInstanceManager.restrictedFiltersResource=Restricted filters property file not found defaultInstanceManager.privilegedFilter=Filter of class {0} is privileged and cannot be loaded by this web application -defaultInstanceManager.restrictedListenersResources="Restricted listeners property file not found \ No newline at end of file +defaultInstanceManager.restrictedListenersResources="Restricted listeners property file not found Modified: branches/2.1.x/java/org/apache/catalina/core/StandardContext.java =================================================================== --- branches/2.1.x/java/org/apache/catalina/core/StandardContext.java 2013-01-08 14:40:54 UTC (rev 2146) +++ branches/2.1.x/java/org/apache/catalina/core/StandardContext.java 2013-01-08 22:31:16 UTC (rev 2147) @@ -3807,6 +3807,7 @@ getLogger().debug("Stopping filters"); // Release all Filter and FilterConfig instances + boolean ok = true; synchronized (filterConfigs) { Iterator names = filterConfigs.keySet().iterator(); while (names.hasNext()) { @@ -3815,11 +3816,17 @@ getLogger().debug(" Stopping filter '" + name + "'"); ApplicationFilterConfig filterConfig = (ApplicationFilterConfig) filterConfigs.get(name); - filterConfig.release(); + try { + filterConfig.release(); + } catch (Throwable t) { + getLogger().error + (sm.getString("standardContext.filterStop", name), t); + ok = false; + } } filterConfigs.clear(); } - return (true); + return (ok); }

11 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2146 - branches/7.2.x.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-01-08 09:40:54 -0500 (Tue, 08 Jan 2013) New Revision: 2146 Added: branches/7.2.x/build.properties.default branches/7.2.x/build.xml Log: Add the Ant script for building Jasper JDT. Added: branches/7.2.x/build.properties.default =================================================================== --- branches/7.2.x/build.properties.default (rev 0) +++ branches/7.2.x/build.properties.default 2013-01-08 14:40:54 UTC (rev 2146) @@ -0,0 +1,43 @@ +# ----------------------------------------------------------------------------- +# build.properties.sample +# +# This is an example "build.properties" file, used to customize building +# JBoss Web for your local environment. It defines the location of all external +# modules that JBoss Web depends on. Copy this file to "build.properties" +# in the top-level source directory, and customize it as needed. +# +# $Id: build.properties.default 526202 2007-04-06 15:44:38Z remm $ +# ----------------------------------------------------------------------------- + +# ----- Version Control Flags ----- +version.major=7 +version.minor=2 +version.build=0 +version.patch=0 +version.tag=SNAPSHOT + +# ----- Default Base Path for Dependent Packages ----- +# Please note this path must be absolute, not relative, +# as it is referenced with different working directory +# contexts by the various build scripts. +base.path=/usr/share/java +#base.path=C:/path/to/the/repository +#base.path=/usr/local + +compile.source=1.6 +compile.target=1.6 +compile.debug=true + +base-commons.loc=http://archive.apache.org/dist/commons +base-tomcat.loc=http://archive.apache.org/dist/tomcat +base-sf.loc=http://downloads.sourceforge.net + +# ----- Eclipse JDT, version 3.2 or later ----- +jdt.home=${base.path}/plugins +jdt.lib=${jdt.home} +jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.7.0.v_B61.jar +jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/org.eclipse.jdt-3.7.zip + +jdt-src.home=${base.path}/eclipse/plugins +jdt-src.lib=${jdt.home} +jdt-src.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/eclipse-sourceBuild-srcIncluded-3.7.zip Added: branches/7.2.x/build.xml =================================================================== (Binary files differ) Property changes on: branches/7.2.x/build.xml ___________________________________________________________________ Added: svn:mime-type + application/xml

11 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2145 - branches/7.2.x/webapps/docs.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-08 09:23:56 -0500 (Tue, 08 Jan 2013) New Revision: 2145 Modified: branches/7.2.x/webapps/docs/sysprops.xml Log: Add the MAX_THREADS property description. Modified: branches/7.2.x/webapps/docs/sysprops.xml =================================================================== --- branches/7.2.x/webapps/docs/sysprops.xml 2013-01-04 12:27:10 UTC (rev 2144) +++ branches/7.2.x/webapps/docs/sysprops.xml 2013-01-08 14:23:56 UTC (rev 2145) @@ -130,6 +130,12 @@ value is <code>128</code> headers. </property> + <property name="org.apache.tomcat.util.net.MAX_THREADS"> + The maximum number of threads a connector is going to use to + process requests. The default value is <code>32 x Runtime.getRuntime().availableProcessors()</code>. + (<code>512 x Runtime.getRuntime().availableProcessors()</code> for the JIO connector) + </property> + <property name="org.apache.coyote.http11.Http11Protocol.MAX_HEADER_SIZE"> The maximum size of the HTTP headers, in bytes. If exceeded, parsing will fail using an ArrayOutOfBoundsExceptions. The default

11 years, 11 months

1
0
0 / 0

JBossWeb SVN: r2144 - in branches/7.2.x: webapps/docs and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-01-04 07:27:10 -0500 (Fri, 04 Jan 2013) New Revision: 2144 Modified: branches/7.2.x/src/main/java/org/apache/el/util/ReflectionUtil.java branches/7.2.x/webapps/docs/changelog.xml Log: AS7-3177: Improved null parameter mapping fix. Modified: branches/7.2.x/src/main/java/org/apache/el/util/ReflectionUtil.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/el/util/ReflectionUtil.java 2013-01-03 01:27:41 UTC (rev 2143) +++ branches/7.2.x/src/main/java/org/apache/el/util/ReflectionUtil.java 2013-01-04 12:27:10 UTC (rev 2144) @@ -249,7 +249,6 @@ return match; } - @SuppressWarnings("null") private static Method resolveAmbiguousMethod(Set<Method> candidates, Class<?>[] paramTypes) { // Identify which parameter isn't an exact match @@ -266,6 +265,11 @@ } } + if (nonMatchClass == null) { + // Null will always be ambiguous + return null; + } + for (Method c : candidates) { if (c.getParameterTypes()[nonMatchIndex] == paramTypes[nonMatchIndex]) { @@ -293,6 +297,12 @@ // src will always be an object private static boolean isAssignableFrom(Class<?> src, Class<?> target) { + // Short-cut. null is always assignable to an object and in EL null + // can always be coerced to a valid value for a primitive + if (src == null) { + return true; + } + Class<?> targetClass; if (target.isPrimitive()) { if (target == Boolean.TYPE) { @@ -333,7 +343,11 @@ if (types != null) { StringBuilder sb = new StringBuilder(); for (int i = 0; i < types.length; i++) { - sb.append(types[i].getName()).append(", "); + if (types[i] == null) { + sb.append("null, "); + } else { + sb.append(types[i].getName()).append(", "); + } } if (sb.length() > 2) { sb.setLength(sb.length() - 2); Modified: branches/7.2.x/webapps/docs/changelog.xml =================================================================== --- branches/7.2.x/webapps/docs/changelog.xml 2013-01-03 01:27:41 UTC (rev 2143) +++ branches/7.2.x/webapps/docs/changelog.xml 2013-01-04 12:27:10 UTC (rev 2144) @@ -22,6 +22,9 @@ <fix> <bug>35410</bug>: Revert bugfix working around a null toString(). (markt) </fix> + <fix> + <bug>54370</bug>: NPE fix for EL method mapping with null parameters. (markt, remm) + </fix> </changelog> </subsection> </section>

11 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits January 2013