Revision: 3169
http://vexi.svn.sourceforge.net/vexi/?rev=3169&view=rev
Author: clrg
Date: 2008-11-03 15:32:20 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
Fix sloppy NPE that slipped into the last update
Modified Paths:
--------------
trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp
Modified: trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp 2008-11-03 13:12:12 UTC
(rev 3168)
+++ trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp 2008-11-03 15:32:20 UTC
(rev 3169)
@@ -1514,7 +1514,7 @@
for (int i=0; i<treeSize(); i++) {
Box b = getChild(i);
trapchain = b.fireSurfaceTraps(val, trapchain);
- if (trapchain.exn!=null) return trapchain;
+ if (trapchain!=null && trapchain.exn!=null) return trapchain;
}
return trapchain;
}
@@ -1531,7 +1531,7 @@
Box b = getChild(i);
if (b.test(DISPLAY)) {
trapchain = b.fireVisibleTraps(val, trapchain);
- if (trapchain.exn!=null) return trapchain;
+ if (trapchain!=null && trapchain.exn!=null) return trapchain;
}
}
return trapchain;
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=/
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
