You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2007/03/17 23:05:45 UTC
svn commit: r519457 -
/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java
Author: dashorst
Date: Sat Mar 17 15:05:44 2007
New Revision: 519457
URL: http://svn.apache.org/viewvc?view=rev&rev=519457
Log:
Fixed NPE in ClassStreamHandler
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java?view=diff&rev=519457&r1=519456&r2=519457
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java Sat Mar 17 15:05:44 2007
@@ -381,7 +381,7 @@
FieldAndIndex fai = null;
try
{
- for (int i = 0; i < fields.size(); i++)
+ for (int i = 0; fields != null && i < fields.size(); i++)
{
fai = (FieldAndIndex)fields.get(i);
fai.writeField(obj, woos);
@@ -394,7 +394,9 @@
}
catch (Exception ex)
{
- throw new WicketSerializeableException("Error writing field: " + fai.field.getName() + " for object class: " + obj.getClass(), ex);
+ String field = fai == null || fai.field == null? "" : fai.field.getName();
+ String msg = "Error writing field: " + field + " for object class: " + obj.getClass();
+ throw new WicketSerializeableException(msg, ex);
}
}
Re: svn commit: r519457 - /incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java
Posted by Martijn Dashorst <ma...@gmail.com>.
I fixed the NPE here, but I am not sure if it just treats the
symptoms. The NPE was discovered using the wicket-spring-annot
example.
Martijn
On 3/17/07, dashorst@apache.org <da...@apache.org> wrote:
> Author: dashorst
> Date: Sat Mar 17 15:05:44 2007
> New Revision: 519457
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=519457
> Log:
> Fixed NPE in ClassStreamHandler
>
> Modified:
> incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java
>
> Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java
> URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java?view=diff&rev=519457&r1=519456&r2=519457
> ==============================================================================
> --- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java (original)
> +++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/io/ClassStreamHandler.java Sat Mar 17 15:05:44 2007
> @@ -381,7 +381,7 @@
> FieldAndIndex fai = null;
> try
> {
> - for (int i = 0; i < fields.size(); i++)
> + for (int i = 0; fields != null && i < fields.size(); i++)
> {
> fai = (FieldAndIndex)fields.get(i);
> fai.writeField(obj, woos);
> @@ -394,7 +394,9 @@
> }
> catch (Exception ex)
> {
> - throw new WicketSerializeableException("Error writing field: " + fai.field.getName() + " for object class: " + obj.getClass(), ex);
> + String field = fai == null || fai.field == null? "" : fai.field.getName();
> + String msg = "Error writing field: " + field + " for object class: " + obj.getClass();
> + throw new WicketSerializeableException(msg, ex);
> }
>
> }
>
>
>
--
Learn Wicket at ApacheCon Europe: http://apachecon.com
Join the wicket community at irc.freenode.net: ##wicket
Wicket 1.2.5 will keep your server alive. Download Wicket now!
http://wicketframework.org