April 2013 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r2185 - branches/7.2.x/src/main/java/org/apache/catalina/startup.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-04-16 08:25:16 -0400 (Tue, 16 Apr 2013) New Revision: 2185 Modified: branches/7.2.x/src/main/java/org/apache/catalina/startup/ContextConfig.java Log: [BZ922180]: Port from Tomcat using a static initializer to init authenticators map. Modified: branches/7.2.x/src/main/java/org/apache/catalina/startup/ContextConfig.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/startup/ContextConfig.java 2013-04-15 17:01:44 UTC (rev 2184) +++ branches/7.2.x/src/main/java/org/apache/catalina/startup/ContextConfig.java 2013-04-16 12:25:16 UTC (rev 2185) @@ -84,6 +84,20 @@ */ protected static Properties authenticators = null; + static { + // Load our mapping properties + authenticators = new Properties(); + try { + InputStream is = ContextConfig.class.getClassLoader().getResourceAsStream("org/apache/catalina/startup/Authenticators.properties"); + if (is != null) { + authenticators.load(is); + } else { + CatalinaLogger.STARTUP_LOGGER.cannotFindAuthenticatoMappings(); + } + } catch (IOException e) { + CatalinaLogger.STARTUP_LOGGER.failedLoadingAuthenticatoMappings(e); + } + } /** * The Context we are associated with. @@ -233,25 +247,6 @@ customAuthenticators.get(loginConfig.getAuthMethod()); } if (authenticator == null) { - // Load our mapping properties if necessary - if (authenticators == null) { - try { - InputStream is=this.getClass().getClassLoader().getResourceAsStream("org/apache/catalina/startup/Authenticators.properties"); - if( is!=null ) { - authenticators = new Properties(); - authenticators.load(is); - } else { - CatalinaLogger.STARTUP_LOGGER.cannotFindAuthenticatoMappings(); - ok=false; - return; - } - } catch (IOException e) { - CatalinaLogger.STARTUP_LOGGER.failedLoadingAuthenticatoMappings(e); - ok = false; - return; - } - } - // Identify the class name of the Valve we should configure String authenticatorName = null; authenticatorName =

11 years

1
0
0 / 0

JBossWeb SVN: r2184 - branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2013-04-15 13:01:44 -0400 (Mon, 15 Apr 2013) New Revision: 2184 Modified: branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java Log: [JBPAPP-10706] commit changes Modified: branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java =================================================================== --- branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java 2013-04-15 16:50:26 UTC (rev 2183) +++ branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java 2013-04-15 17:01:44 UTC (rev 2184) @@ -22,7 +22,7 @@ V v = this.eden.get(k); if (v == null) { synchronized (longterm) { - value = this.longterm.get(key); + v = this.longterm.get(k); } if (v != null) { this.eden.put(k, v);

11 years

1
0
0 / 0

JBossWeb SVN: r2183 - in branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java: org/apache/el/util and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2013-04-15 12:50:26 -0400 (Mon, 15 Apr 2013) New Revision: 2183 Modified: branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/javax/el/BeanELResolver.java branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java Log: [JBPAPP-10706] commit changes Modified: branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/javax/el/BeanELResolver.java =================================================================== --- branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/javax/el/BeanELResolver.java 2013-04-12 20:40:34 UTC (rev 2182) +++ branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/javax/el/BeanELResolver.java 2013-04-15 16:50:26 UTC (rev 2183) @@ -324,7 +324,9 @@ public V get(K key) { V value = this.eden.get(key); if (value == null) { - value = this.longterm.get(key); + synchronized (longterm) { + value = this.longterm.get(key); + } if (value != null) { this.eden.put(key, value); } @@ -334,7 +336,9 @@ public void put(K key, V value) { if (this.eden.size() >= this.size) { - this.longterm.putAll(this.eden); + synchronized (longterm) { + this.longterm.putAll(this.eden); + } this.eden.clear(); } this.eden.put(key, value); Modified: branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java =================================================================== --- branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java 2013-04-12 20:40:34 UTC (rev 2182) +++ branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/java/org/apache/el/util/ConcurrentCache.java 2013-04-15 16:50:26 UTC (rev 2183) @@ -21,7 +21,9 @@ public V get(K k) { V v = this.eden.get(k); if (v == null) { - v = this.longterm.get(k); + synchronized (longterm) { + value = this.longterm.get(key); + } if (v != null) { this.eden.put(k, v); } @@ -31,7 +33,9 @@ public void put(K k, V v) { if (this.eden.size() >= size) { - this.longterm.putAll(this.eden); + synchronized (longterm) { + this.longterm.putAll(this.eden); + } this.eden.clear(); } this.eden.put(k, v);

11 years

1
0
0 / 0

JBossWeb SVN: r2182 - branches.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2013-04-12 16:40:34 -0400 (Fri, 12 Apr 2013) New Revision: 2182 Added: branches/JBOSSWEB_2_1_10_GA_JBPAPP-10706/ Log: [JBPAPP-10706] create one-off patch branch

11 years

1
0
0 / 0

JBossWeb SVN: r2181 - branches/8.0.x/src/main/java/org/apache/catalina/startup.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-04-12 11:17:02 -0400 (Fri, 12 Apr 2013) New Revision: 2181 Modified: branches/8.0.x/src/main/java/org/apache/catalina/startup/ContextConfig.java Log: [BZ922180]: Port from Tomcat using a static initializer to init authenticators map. Modified: branches/8.0.x/src/main/java/org/apache/catalina/startup/ContextConfig.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/startup/ContextConfig.java 2013-04-04 16:23:36 UTC (rev 2180) +++ branches/8.0.x/src/main/java/org/apache/catalina/startup/ContextConfig.java 2013-04-12 15:17:02 UTC (rev 2181) @@ -84,6 +84,20 @@ */ protected static Properties authenticators = null; + static { + // Load our mapping properties + authenticators = new Properties(); + try { + InputStream is = ContextConfig.class.getClassLoader().getResourceAsStream("org/apache/catalina/startup/Authenticators.properties"); + if (is != null) { + authenticators.load(is); + } else { + CatalinaLogger.STARTUP_LOGGER.cannotFindAuthenticatoMappings(); + } + } catch (IOException e) { + CatalinaLogger.STARTUP_LOGGER.failedLoadingAuthenticatoMappings(e); + } + } /** * The Context we are associated with. @@ -233,25 +247,6 @@ customAuthenticators.get(loginConfig.getAuthMethod()); } if (authenticator == null) { - // Load our mapping properties if necessary - if (authenticators == null) { - try { - InputStream is=this.getClass().getClassLoader().getResourceAsStream("org/apache/catalina/startup/Authenticators.properties"); - if( is!=null ) { - authenticators = new Properties(); - authenticators.load(is); - } else { - CatalinaLogger.STARTUP_LOGGER.cannotFindAuthenticatoMappings(); - ok=false; - return; - } - } catch (IOException e) { - CatalinaLogger.STARTUP_LOGGER.failedLoadingAuthenticatoMappings(e); - ok = false; - return; - } - } - // Identify the class name of the Valve we should configure String authenticatorName = null; authenticatorName =

11 years

1
0
0 / 0

JBossWeb SVN: r2180 - in branches/8.0.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-04-04 12:23:36 -0400 (Thu, 04 Apr 2013) New Revision: 2180 Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/InputBuffer.java branches/8.0.x/src/main/java/org/apache/catalina/connector/OutputBuffer.java branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java branches/8.0.x/src/main/java/org/apache/catalina/connector/Response.java branches/8.0.x/src/main/java/org/apache/catalina/core/ApplicationContext.java branches/8.0.x/src/main/java/org/jboss/web/CatalinaMessages.java Log: Some 3.1 fixes, after reviewing the javadoc. Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/InputBuffer.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/InputBuffer.java 2013-04-02 12:36:25 UTC (rev 2179) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/InputBuffer.java 2013-04-04 16:23:36 UTC (rev 2180) @@ -592,6 +592,12 @@ if (this.readListener != null) { throw MESSAGES.readListenerAlreadySet(); } + if (readListener == null) { + throw MESSAGES.nullListener(); + } + if (!request.isEventMode()) { + throw MESSAGES.cannotSetListenerWithoutUpgradeOrAsync(); + } this.readListener = readListener; coyoteRequest.action(ActionCode.ACTION_EVENT_READ_BEGIN, null); } Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/OutputBuffer.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/OutputBuffer.java 2013-04-02 12:36:25 UTC (rev 2179) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/OutputBuffer.java 2013-04-04 16:23:36 UTC (rev 2180) @@ -147,6 +147,12 @@ /** + * Associated request. + */ + private org.apache.catalina.connector.Response response; + + + /** * Suspended flag. All output bytes will be swallowed if this is true. */ private boolean suspended = false; @@ -164,9 +170,9 @@ /** * Default constructor. Allocate the buffer with the default buffer size. */ - public OutputBuffer() { + public OutputBuffer(org.apache.catalina.connector.Response response) { - this(DEFAULT_BUFFER_SIZE); + this(response, DEFAULT_BUFFER_SIZE); } @@ -176,8 +182,9 @@ * * @param size Buffer size to use */ - public OutputBuffer(int size) { + public OutputBuffer(org.apache.catalina.connector.Response response, int size) { + this.response = response; bb = new ByteChunk(size); bb.setLimit(size); bb.setByteOutputChannel(this); @@ -681,6 +688,12 @@ if (this.writeListener != null) { throw MESSAGES.writeListenerAlreadySet(); } + if (writeListener == null) { + throw MESSAGES.nullListener(); + } + if (!response.getRequest().isEventMode()) { + throw MESSAGES.cannotSetListenerWithoutUpgradeOrAsync(); + } this.writeListener = writeListener; coyoteResponse.action(ActionCode.ACTION_EVENT_WRITE_BEGIN, null); } Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java 2013-04-02 12:36:25 UTC (rev 2179) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java 2013-04-04 16:23:36 UTC (rev 2180) @@ -3343,6 +3343,7 @@ throw new IOException(MESSAGES.upgradeError(), upgradeError); } response.sendUpgrade(); + eventMode = true; ugradeHandler.init(getEvent()); this.upgradeHandler = ugradeHandler; return ugradeHandler; Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/Response.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/Response.java 2013-04-02 12:36:25 UTC (rev 2179) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/Response.java 2013-04-04 16:23:36 UTC (rev 2180) @@ -126,9 +126,9 @@ this.connector = connector; if("AJP/1.3".equals(connector.getProtocol())) { // default size to size of one ajp-packet - outputBuffer = new OutputBuffer(8184); + outputBuffer = new OutputBuffer(this, 8184); } else { - outputBuffer = new OutputBuffer(); + outputBuffer = new OutputBuffer(this); } outputStream = new CoyoteOutputStream(outputBuffer); writer = new CoyoteWriter(outputBuffer); Modified: branches/8.0.x/src/main/java/org/apache/catalina/core/ApplicationContext.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/core/ApplicationContext.java 2013-04-02 12:36:25 UTC (rev 2179) +++ branches/8.0.x/src/main/java/org/apache/catalina/core/ApplicationContext.java 2013-04-04 16:23:36 UTC (rev 2180) @@ -1232,6 +1232,9 @@ } public String getVirtualServerName() { + if (restricted) { + throw MESSAGES.restrictedListenerCannotCallMethod(); + } return ((Host) context.getParent()).getName(); } Modified: branches/8.0.x/src/main/java/org/jboss/web/CatalinaMessages.java =================================================================== --- branches/8.0.x/src/main/java/org/jboss/web/CatalinaMessages.java 2013-04-02 12:36:25 UTC (rev 2179) +++ branches/8.0.x/src/main/java/org/jboss/web/CatalinaMessages.java 2013-04-04 16:23:36 UTC (rev 2180) @@ -987,4 +987,10 @@ @Message(id = 365, value = "IO listener processing for servlet %s threw exception") String ioListenerError(String servletName); + @Message(id = 366, value = "Null read or write listener") + NullPointerException nullListener(); + + @Message(id = 366, value = "Cannot use a read or write listener without upgrading or starting async") + IllegalStateException cannotSetListenerWithoutUpgradeOrAsync(); + }

11 years, 1 month

1
0
0 / 0

JBossWeb SVN: r2179 - branches/8.0.x/src/main/java/org/apache/catalina/connector.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2013-04-02 08:36:25 -0400 (Tue, 02 Apr 2013) New Revision: 2179 Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java Log: Align with Tomcat's array list to allow using the same part name multiple times since it is not really known if it is allowed or not (but getPart(String) will return the first one, only the full iteration allows accessing the others). Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java 2013-03-25 16:18:31 UTC (rev 2178) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java 2013-04-02 12:36:25 UTC (rev 2179) @@ -380,7 +380,7 @@ /** * Parts associated with the request. */ - protected Map<String, Part> parts = null; + protected Collection<Part> parts = null; /** @@ -2923,7 +2923,7 @@ protected void parseMultipart() throws IOException, ServletException { - parts = Collections.emptyMap(); + parts = Collections.emptyList(); if (context == null) return; @@ -2974,14 +2974,14 @@ upload.setFileSizeMax(config.getMaxFileSize()); upload.setSizeMax(config.getMaxRequestSize()); - parts = new HashMap<String, Part>(); + parts = new ArrayList<Part>(); try { for (FileItem fileItem : upload.parseRequest(getRequest())) { if (fileItem.getName() == null) { coyoteRequest.getParameters().addParameterValues (fileItem.getFieldName(), new String[] {fileItem.getString()}); } - parts.put(fileItem.getFieldName(), new StandardPart(fileItem, config)); + parts.add(new StandardPart(fileItem, config)); } } catch(FileSizeLimitExceededException e) { throw MESSAGES.multipartProcessingFailed(e); @@ -3287,7 +3287,15 @@ if (parts == null) { parseMultipart(); } - return parts.get(name); + Collection<Part> c = getParts(); + Iterator<Part> iterator = c.iterator(); + while (iterator.hasNext()) { + Part part = iterator.next(); + if (name.equals(part.getName())) { + return part; + } + } + return null; } @@ -3295,7 +3303,7 @@ if (parts == null) { parseMultipart(); } - return parts.values(); + return parts; }

11 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits April 2013