Author: jdonnerstag
Date: Mon Jul 26 10:18:37 2010
New Revision: 979225
URL: http://svn.apache.org/viewvc?rev=979225&view=rev
Log:
fixed: "markupStream" field in MarkupException breaks Exception's Serializable
contract.
Issue: WICKET-2966
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/MarkupException.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java?rev=979225&r1=979224&r2=979225&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java
Mon Jul 26 10:18:37 2010
@@ -29,10 +29,10 @@ public class UnauthorizedActionException
private static final long serialVersionUID = 1L;
/** The action */
- private final Action action;
+ private final transient Action action;
/** The component that caused the unauthorized exception */
- private final Component component;
+ private final transient Component component;
/**
* Construct.
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/MarkupException.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/MarkupException.java?rev=979225&r1=979224&r2=979225&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/MarkupException.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/MarkupException.java
Mon Jul 26 10:18:37 2010
@@ -29,7 +29,7 @@ public final class MarkupException exten
private static final long serialVersionUID = 1L;
/** The markup stream that was being parsed when the exception was
thrown */
- private MarkupStream markupStream;
+ private transient MarkupStream markupStream;
/**
* Constructor
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java?rev=979225&r1=979224&r2=979225&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/convert/ConversionException.java
Mon Jul 26 10:18:37 2010
@@ -35,25 +35,25 @@ public class ConversionException extends
private static final long serialVersionUID = 1L;
/** The converter that was used. */
- private IConverter converter;
+ private transient IConverter converter;
/** Pattern that was used for conversion. */
- private Format format;
+ private transient Format format;
/** Locale that was used for conversion. */
- private Locale locale;
+ private transient Locale locale;
/** The value that was tried to convert. */
- private Object sourceValue;
+ private transient Object sourceValue;
/** Target type for the failed conversion. */
- private String targetTypeName;
+ private transient String targetTypeName;
/** Resource key for the message that should be displayed */
- private String resourceKey;
+ private transient String resourceKey;
/** Variable map to use in variable substitution */
- private Map<String, Object> vars;
+ private transient Map<String, Object> vars;
/**
* Construct exception with message.
