You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2005/09/29 20:17:52 UTC
svn commit: r292498 - in /jakarta/tapestry/trunk:
framework/src/java/org/apache/tapestry/describe/ObjectArrayRenderStrategy.java
framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java
status.xml
Author: hlship
Date: Thu Sep 29 11:17:45 2005
New Revision: 292498
URL: http://svn.apache.org/viewcvs?rev=292498&view=rev
Log:
TAPESTRY-676: Tapestry Inspector can throw an exception on the properties page, if a property is an array containing nulls
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/describe/ObjectArrayRenderStrategy.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java
jakarta/tapestry/trunk/status.xml
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/describe/ObjectArrayRenderStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/describe/ObjectArrayRenderStrategy.java?rev=292498&r1=292497&r2=292498&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/describe/ObjectArrayRenderStrategy.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/describe/ObjectArrayRenderStrategy.java Thu Sep 29 11:17:45 2005
@@ -44,7 +44,18 @@
for (int i = 0; i < array.length; i++)
{
writer.begin("li");
- _renderStrategy.renderObject(array[i], writer, cycle);
+
+ Object item = array[i];
+
+ if (item == null)
+ {
+ writer.begin("em");
+ writer.print("<NULL>");
+ writer.end();
+ }
+ else
+ _renderStrategy.renderObject(item, writer, cycle);
+
writer.end();
}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java?rev=292498&r1=292497&r2=292498&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java Thu Sep 29 11:17:45 2005
@@ -83,4 +83,27 @@
verifyControls();
}
+
+ public void testNullInArray()
+ {
+ Object[] array =
+ { null };
+
+ IMarkupWriter writer = newWriter();
+ IRequestCycle cycle = newCycle();
+
+ writer.begin("ul");
+ writer.begin("li");
+ writer.begin("em");
+ writer.print("<NULL>");
+ writer.end();
+ writer.end();
+ writer.end();
+
+ replayControls();
+
+ new ObjectArrayRenderStrategy().renderObject(array, writer, cycle);
+
+ verifyControls();
+ }
}
Modified: jakarta/tapestry/trunk/status.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/status.xml?rev=292498&r1=292497&r2=292498&view=diff
==============================================================================
--- jakarta/tapestry/trunk/status.xml (original)
+++ jakarta/tapestry/trunk/status.xml Thu Sep 29 11:17:45 2005
@@ -54,6 +54,7 @@
<action type="fix" dev="DS" fixes-bug="TAPESTRY-663">Document Button component</action>
<action type="fix" dev="DS" fixes-bug="TAPESTRY-491">Document Inspector component</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-601">EnhanceUtils needs null checks in the primitive unwrapper methods</action>
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-676">Tapestry Inspector can throw an exception on the properties page, if a property is an array containing nulls</action>
</release>
<release version="4.0-beta-8" date="Sep 24 2005">
<action type="fix" dev="DS" fixes-bug="TAPESTRY-465">Document Foreach component</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org