Revision: 995
http://stripes.svn.sourceforge.net/stripes/?rev=995&view=rev
Author: bengunter
Date: 2008-10-25 04:14:12 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
STS-617: Catch and ignore UrlBindingConflictException at some key spots to
avoid interfering with some legitimate operations.
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
trunk/stripes/src/net/sourceforge/stripes/util/UrlBuilder.java
Modified:
trunk/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
2008-10-25 03:47:43 UTC (rev 994)
+++
trunk/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
2008-10-25 04:14:12 UTC (rev 995)
@@ -35,6 +35,7 @@
import net.sourceforge.stripes.action.FileBean;
import net.sourceforge.stripes.controller.multipart.MultipartWrapper;
import net.sourceforge.stripes.exception.StripesServletException;
+import net.sourceforge.stripes.exception.UrlBindingConflictException;
/**
* HttpServletRequestWrapper that is used to make the file upload
functionality transparent.
@@ -466,8 +467,15 @@
* [EMAIL PROTECTED] Map}. If no parameters are present in the URI, then
return null.
*/
Map<String, String[]> getUriParameters(HttpServletRequest request) {
+ UrlBinding binding = null;
+ try {
+ binding = UrlBindingFactory.getInstance().getBinding(request);
+ }
+ catch (UrlBindingConflictException e) {
+ // This can be safely ignored
+ }
+
Map<String, String[]> params = null;
- UrlBinding binding =
UrlBindingFactory.getInstance().getBinding(request);
if (binding != null && binding.getParameters().size() > 0) {
for (UrlBindingParameter p : binding.getParameters()) {
String name = p.getName();
Modified: trunk/stripes/src/net/sourceforge/stripes/util/UrlBuilder.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/util/UrlBuilder.java
2008-10-25 03:47:43 UTC (rev 994)
+++ trunk/stripes/src/net/sourceforge/stripes/util/UrlBuilder.java
2008-10-25 04:14:12 UTC (rev 995)
@@ -367,8 +367,14 @@
Map<String, ValidationMetadata> validations = null;
Configuration configuration = StripesFilter.getConfiguration();
if (configuration != null) {
- Class<? extends ActionBean> beanType =
configuration.getActionResolver()
- .getActionBeanType(this.baseUrl);
+ Class<? extends ActionBean> beanType = null;
+ try {
+ beanType =
configuration.getActionResolver().getActionBeanType(this.baseUrl);
+ }
+ catch (UrlBindingConflictException e) {
+ // This can be safely ignored
+ }
+
if (beanType != null) {
validations =
configuration.getValidationMetadataProvider().getValidationMetadata(
beanType);
@@ -444,7 +450,14 @@
* @see #UrlBuilder(Locale, String, boolean)
*/
protected String getBaseURL(String baseUrl, Collection<Parameter>
parameters) {
- UrlBinding binding =
UrlBindingFactory.getInstance().getBindingPrototype(baseUrl);
+ UrlBinding binding = null;
+ try {
+ binding =
UrlBindingFactory.getInstance().getBindingPrototype(baseUrl);
+ }
+ catch (UrlBindingConflictException e) {
+ // This can be safely ignored
+ }
+
if (binding == null || binding.getParameters().size() == 0) {
return baseUrl;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
