[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - OpenJPA (openjpa) http://cwiki.apache.org/confluence/display/openjpa | |-Pages Added or Edited in This Space |-- OpenJPA Up Close and Personal was last edited by chbussler (02:59 PM). | http://cwiki.apache.org/confluence/display/openjpa/OpenJPA+Up+Close+and+Personal Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Book Enterprise Integration Patterns was last edited by jstrachan (04:24 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Book+Enterprise+Integration+Patterns Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Apache Felix Community Roles and Processes was last edited by [EMAIL PROTECTED] (09:02 AM). | http://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Community+Roles+and+Processes OpenEJB (OPENEJB) http://cwiki.apache.org/confluence/display/OPENEJB | |-Pages Added or Edited in This Space |-- FAQ was last edited by jlaskowski (06:03 AM). | http://cwiki.apache.org/confluence/display/OPENEJB/FAQ Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- JAX-WS Configuration was last edited by dkulp (02:25 PM). | http://cwiki.apache.org/confluence/display/CXF20DOC/JAX-WS+Configuration |-- Writing a service with Spring was last edited by [EMAIL PROTECTED] (10:04 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Writing+a+service+with+Spring Apache ActiveMQ (ACTIVEMQ) http://cwiki.apache.org/confluence/display/ACTIVEMQ | |-Pages Added or Edited in This Space |-- How does ConnectionFactory relate to the Broker was created by jstrachan (11:17 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/How+does+ConnectionFactory+relate+to+the+Broker |-- What are administered objects was created by jstrachan (11:21 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/What+are+administered+objects Apache Geronimo v2.0 (GMOxDOC20) http://cwiki.apache.org/confluence/display/GMOxDOC20 | |-Pages Added or Edited in This Space |-- Using JNDI in Geronimo 2.0 was created by vhnguyen (10:51 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/Using+JNDI+in+Geronimo+2.0 |-- Multiple Repositories was last edited by djencks (10:49 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/Multiple+Repositories Apache ServiceMix (SM) http://cwiki.apache.org/confluence/display/SM | |-Pages Added or Edited in This Space |-- Support was last edited by rpetersen (12:10 PM). | http://cwiki.apache.org/confluence/display/SM/Support |-- servicemix-http was last edited by prossma (10:06 AM). | http://cwiki.apache.org/confluence/display/SM/servicemix-http Tuscany Wiki (TUSCANYWIKI) http://cwiki.apache.org/confluence/display/TUSCANYWIKI | |-Pages Added or Edited in This Space |-- Draft TLP Resolution was created by ant (06:35 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Draft+TLP+Resolution |-- SCA Java Next Release Contents was last edited by ant (06:15 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/SCA+Java+Next+Release+Contents |-- Articles About Tuscany was last edited by slaws (04:03 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Articles+About+Tuscany Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- S2-001 was last edited by husted (08:02 PM). | http://cwiki.apache.org/confluence/display/WW/S2-001 |-- Creating and Signing a Distribution was last edited by husted (01:24 PM). | http://cwiki.apache.org/confluence/display/WW/Creating+and+Signing+a+Distribution UIMA (UIMA) http://cwiki.apache.org/confluence/display/UIMA | |-Pages Added or Edited in This Space |-- TestPlan2.2 was last edited by mbaessler (10:56 AM). | http://cwiki.apache.org/confluence/display/UIMA/TestPlan2.2 Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- SCA Java binding.ws was last edited by ant (06:34 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+binding.ws |-- SCA Java binding.rmi was last edited by ant (06:34 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+binding.rmi |-- SCA Java binding.jsonrpc was last edited by ant (06:33 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+binding.jsonrpc |-- SCA Java implementation.script was last edited by ant (06:33 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+implementation.script |-- SCA Java implementation.
svn commit: r559057 - in /struts/site/src/site/xdoc: download.xml downloads.xml index.xml
Author: husted
Date: Tue Jul 24 07:15:56 2007
New Revision: 559057
URL: http://svn.apache.org/viewvc?view=rev&rev=559057
Log:
WW-1974 Update download links to include time the archives were submitted to
mirroring (7:30 pm PST). I've tested several links and found 2.0.9 in each one
tried, so I'll go ahead and post the changes now.
Modified:
struts/site/src/site/xdoc/download.xml
struts/site/src/site/xdoc/downloads.xml
struts/site/src/site/xdoc/index.xml
Modified: struts/site/src/site/xdoc/download.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/download.xml?view=diff&rev=559057&r1=559056&r2=559057
==
--- struts/site/src/site/xdoc/download.xml (original)
+++ struts/site/src/site/xdoc/download.xml Tue Jul 24 07:15:56 2007
@@ -124,7 +124,7 @@
-
+
Essential Dependencies Only:
Modified: struts/site/src/site/xdoc/downloads.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/downloads.xml?view=diff&rev=559057&r1=559056&r2=559057
==
--- struts/site/src/site/xdoc/downloads.xml (original)
+++ struts/site/src/site/xdoc/downloads.xml Tue Jul 24 07:15:56 2007
@@ -43,8 +43,8 @@
General Availability (GA) Releases -
Ready for Prime Time!
-http://struts.apache.org/download.cgi#struts208";>
-Struts 2.0.8
+http://struts.apache.org/download.cgi#struts209?update=200707231930";>
+Struts 2.0.9
("best available")
Modified: struts/site/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?view=diff&rev=559057&r1=559056&r2=559057
==
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Tue Jul 24 07:15:56 2007
@@ -26,7 +26,7 @@
-http://struts.apache.org/download.cgi#struts209";>Apache Struts 2.0.9
+http://struts.apache.org/download.cgi#struts209?update=200707231930";>Apache
Struts 2.0.9
includes an important security fix regarding http://struts.apache.org/2.x/docs/s2-001.html";>a remote code
exploit.
ALL USERS ARE STRONGLY ADVISED TO UPDATE TO STRUTS 2.0.9
IMMEDIATELY!
@@ -63,7 +63,7 @@
-http://struts.apache.org/download.cgi#struts209";>Apache Struts 2.0.9
+http://struts.apache.org/download.cgi#struts209?update=200707231930";>Apache
Struts 2.0.9
includes an important security fix regarding OGNL expression
handling.
ALL USERS ARE STRONGLY ADVISED TO UPDATE TO STRUTS 2.0.9 AS SOON
AS POSSIBLE!
svn commit: r559060 - /struts/site/src/site/site.xml
Author: husted Date: Tue Jul 24 07:30:45 2007 New Revision: 559060 URL: http://svn.apache.org/viewvc?view=rev&rev=559060 Log: WW-1974 Update site menu to point to 2.0.9. Modified: struts/site/src/site/site.xml Modified: struts/site/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/site/src/site/site.xml?view=diff&rev=559060&r1=559059&r2=559060 == --- struts/site/src/site/site.xml (original) +++ struts/site/src/site/site.xml Tue Jul 24 07:30:45 2007 @@ -17,7 +17,7 @@ href="http://projects.apache.org"; /> http://struts.apache.org/2.0.8/"; /> +href="http://struts.apache.org/2.0.9/"; /> http://struts.apache.org/1.3.8/"; /> @@ -55,8 +55,8 @@ name="Key Technologies" href="primer.html" /> http://struts.apache.org/2.0.8/index.html"; /> +name="Struts 2.0.9" +href="http://struts.apache.org/2.0.9/index.html"; /> http://struts.apache.org/1.3.8/index.html"; />
svn commit: r559086 - /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
Author: jholmes Date: Tue Jul 24 08:36:11 2007 New Revision: 559086 URL: http://svn.apache.org/viewvc?view=rev&rev=559086 Log: Add missing license. Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java?view=diff&rev=559086&r1=559085&r2=559086 == --- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java (original) +++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java Tue Jul 24 08:36:11 2007 @@ -1,3 +1,23 @@ +/* + * $Id$ + * + * 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 org.apache.struts2.components; import java.io.IOException;
svn commit: r559107 - /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java
Author: jholmes Date: Tue Jul 24 10:03:11 2007 New Revision: 559107 URL: http://svn.apache.org/viewvc?view=rev&rev=559107 Log: Add missing license. Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java?view=diff&rev=559107&r1=559106&r2=559107 == --- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java (original) +++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java Tue Jul 24 10:03:11 2007 @@ -1,3 +1,23 @@ +/* + * $Id$ + * + * 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 org.apache.struts2.portlet.interceptor; import org.apache.struts2.interceptor.PrincipalProxy;
svn commit: r559127 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/jsp/ main/java/org/apache/struts2/views/util/ site/resources/tags/
Author: jholmes
Date: Tue Jul 24 10:33:38 2007
New Revision: 559127
URL: http://svn.apache.org/viewvc?view=rev&rev=559127
Log:
WW-1938 Bug with multiple s:param tags inside s:url tag
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
struts/struts2/trunk/core/src/site/resources/tags/url.html
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java?view=diff&rev=559127&r1=559126&r2=559127
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
Tue Jul 24 10:33:38 2007
@@ -333,16 +333,19 @@
* @param scheme http or https
* @param includeContext should the context path be included or not
* @param encodeResultshould the url be encoded
+ * @param forceAddSchemeHostAndPortshould the scheme host and port be
forced
+ * @param escapeAmpshould ampersand (&) be escaped to &
* @return the action url.
*/
protected String determineActionURL(String action, String namespace,
String method,
HttpServletRequest req,
HttpServletResponse res, Map parameters, String scheme,
-boolean includeContext, boolean
encodeResult) {
+boolean includeContext, boolean
encodeResult, boolean forceAddSchemeHostAndPort,
+boolean escapeAmp) {
String finalAction = findString(action);
String finalNamespace = determineNamespace(namespace, getStack(), req);
ActionMapping mapping = new ActionMapping(finalAction, finalNamespace,
method, parameters);
String uri = actionMapper.getUriFromActionMapping(mapping);
-return UrlHelper.buildUrl(uri, req, res, parameters, scheme,
includeContext, encodeResult);
+return UrlHelper.buildUrl(uri, req, res, parameters, scheme,
includeContext, encodeResult, forceAddSchemeHostAndPort, escapeAmp);
}
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java?view=diff&rev=559127&r1=559126&r2=559127
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
Tue Jul 24 10:33:38 2007
@@ -1,3 +1,23 @@
+/*
+ * $Id$
+ *
+ * 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 org.apache.struts2.components;
import java.io.IOException;
@@ -29,7 +49,7 @@
String result;
if (urlComponent.value == null && urlComponent.action != null) {
- result =
urlComponent.determineActionURL(urlComponent.action, urlComponent.namespace,
urlComponent.method, urlComponent.req, urlComponent.res,
urlComponent.parameters, scheme, urlComponent.includeContext,
urlComponent.encode);
+ result =
urlComponent.determineActionURL(urlComponent.action, urlComponent.namespace,
urlComponent.method, urlComponent.req, urlComponent.res,
urlComponent.parameters, scheme, urlComponen
svn commit: r559146 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/jsp/ main/java/org/apache/struts2/views/util/ site/
Author: jholmes
Date: Tue Jul 24 11:15:13 2007
New Revision: 559146
URL: http://svn.apache.org/viewvc?view=rev&rev=559146
Log:
WW-1938 Bug with multiple s:param tags inside s:url tag
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Component.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Component.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Component.java?view=diff&rev=559146&r1=559145&r2=559146
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Component.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Component.java
Tue Jul 24 11:15:13 2007
@@ -338,12 +338,13 @@
*/
protected String determineActionURL(String action, String namespace,
String method,
HttpServletRequest req,
HttpServletResponse res, Map parameters, String scheme,
-boolean includeContext, boolean
encodeResult) {
+boolean includeContext, boolean
encodeResult, boolean forceAddSchemeHostAndPort,
+boolean escapeAmp) {
String finalAction = findString(action);
String finalNamespace = determineNamespace(namespace, getStack(), req);
ActionMapping mapping = new ActionMapping(finalAction, finalNamespace,
method, parameters);
String uri = actionMapper.getUriFromActionMapping(mapping);
-return UrlHelper.buildUrl(uri, req, res, parameters, scheme,
includeContext, encodeResult);
+return UrlHelper.buildUrl(uri, req, res, parameters, scheme,
includeContext, encodeResult, forceAddSchemeHostAndPort, escapeAmp);
}
/**
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java?view=diff&rev=559146&r1=559145&r2=559146
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
Tue Jul 24 11:15:13 2007
@@ -53,6 +53,12 @@
* additional request parameters.
*
* NOTE:
+ * By default request parameters will be separated using escaped ampersands
(i.e., &).
+ * This is necessary for XHTML compliance, however, when using the URL
generated by this tag
+ * with the tag, the escapeAmp attribute should be
used to disable
+ * ampersand escaping.
+ *
+ * NOTE:
* When includeParams is 'all' or 'get', the parameter defined in param tag
will take
* precedence and will not be overriden if they exists in the parameter
submitted. For
* example, in Example 3 below, if there is a id parameter in the url where
the page this
@@ -68,16 +74,20 @@
*
* action (String) - (value or action choose either one, if both
exist value takes precedence) action's name (alias)
* value (String) - (value or action choose either one, if both exist
value takes precedence) the url itself
- * scheme (String) - http scheme (http, https) default to the scheme
this request is in
+ * scheme (String) - http scheme (http, https) defaults to the scheme
this request is in
* namespace - action's namespace
- * method (String) - action's method, default to execute()
- * encode (Boolean) - url encode the generated url. Default is
true
- * includeParams (String) - The includeParams attribute may have the
value 'none', 'get' or 'all'. Default is 'get'.
+ * method (String) - action's method name, defaults to 'execute'
+ * encode (Boolean) - url encode the generated url. Defaults to
'true'.
+ * includeParams (String) - The includeParams attribute may have the
value 'none', 'get' or 'all'. Defaults to 'get'.
* none - include no parameters in the URL
* get
svn commit: r559304 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Author: jholmes
Date: Tue Jul 24 20:39:12 2007
New Revision: 559304
URL: http://svn.apache.org/viewvc?view=rev&rev=559304
Log:
WW-1911 File Upload: content-type validation fails when no file is uploaded
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java?view=diff&rev=559304&r1=559303&r2=559304
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Tue Jul 24 20:39:12 2007
@@ -115,6 +115,12 @@
} else {
log.debug("Item is a file upload");
+// Skip file uploads that don't have a file name - meaning
that no file was selected.
+if (item.getName() == null ||
item.getName().trim().length() < 1) {
+log.debug("No file has been uploaded for the field: "
+ item.getFieldName());
+continue;
+}
+
List values;
if (files.get(item.getFieldName()) != null) {
values = files.get(item.getFieldName());
svn commit: r559307 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Author: jholmes
Date: Tue Jul 24 20:45:17 2007
New Revision: 559307
URL: http://svn.apache.org/viewvc?view=rev&rev=559307
Log:
WW-1911 File Upload: content-type validation fails when no file is uploaded
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java?view=diff&rev=559307&r1=559306&r2=559307
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Tue Jul 24 20:45:17 2007
@@ -115,6 +115,12 @@
} else {
log.debug("Item is a file upload");
+// Skip file uploads that don't have a file name - meaning
that no file was selected.
+if (item.getName() == null ||
item.getName().trim().length() < 1) {
+log.debug("No file has been uploaded for the field: "
+ item.getFieldName());
+continue;
+}
+
List values;
if (files.get(item.getFieldName()) != null) {
values = files.get(item.getFieldName());
