hlship 2005/08/04 16:05:01
Modified: . status.xml
framework/src/java/org/apache/tapestry
NestedMarkupWriter.java
framework/src/java/org/apache/tapestry/markup
NestedMarkupWriterImpl.java
Log:
TAPESTRY-519: NestedMarkupWriterImpl doesn't close the current open tag when
getBuffer() is called
Revision Changes Path
1.185 +1 -0 jakarta-tapestry/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/status.xml,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- status.xml 4 Aug 2005 22:15:33 -0000 1.184
+++ status.xml 4 Aug 2005 23:05:01 -0000 1.185
@@ -66,6 +66,7 @@
<action type="update" dev="PF">Deprecate label parameter of Button
component</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-527">Tapestry 4.0 DTD
invalid</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-524" due-to="Adam
Greene">Client Side Persistence Scopes can conflict with each other</action>
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-519" due-to="Raphael
Jean">NestedMarkupWriterImpl doesn't close the current open tag when
getBuffer() is called</action>
</release>
<release version="4.0-beta-3" date="Jul 22 2005">
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-398" due-to="Jonas
Maurus">HiveMind configuration error breaks the useage of the state: binding
prefix</action>
1.2 +2 -0
jakarta-tapestry/framework/src/java/org/apache/tapestry/NestedMarkupWriter.java
Index: NestedMarkupWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/NestedMarkupWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NestedMarkupWriter.java 3 May 2005 17:41:26 -0000 1.1
+++ NestedMarkupWriter.java 4 Aug 2005 23:05:01 -0000 1.2
@@ -29,6 +29,8 @@
* Returns any makrup so far accumulated by the nested markup writer.
When the nested markup
* writer is closed, it invokes [EMAIL PROTECTED]
org.apache.tapestry.IMarkupWriter#printRaw(String)},
* with this content, on its parent markup writer.
+ * <p>
+ * Getting the buffer will <em>close</em> the writer.
*/
public String getBuffer();
1.4 +7 -7
jakarta-tapestry/framework/src/java/org/apache/tapestry/markup/NestedMarkupWriterImpl.java
Index: NestedMarkupWriterImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/markup/NestedMarkupWriterImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NestedMarkupWriterImpl.java 3 May 2005 17:41:27 -0000 1.3
+++ NestedMarkupWriterImpl.java 4 Aug 2005 23:05:01 -0000 1.4
@@ -38,6 +38,13 @@
public String getBuffer()
{
+ if (_closed)
+ throw new IllegalStateException(MarkupMessages.closeOnce());
+
+ _closed = true;
+
+ super.close();
+
return _charArrayWriter.toString();
}
@@ -66,13 +73,6 @@
public void close()
{
- if (_closed)
- throw new IllegalStateException(MarkupMessages.closeOnce());
-
- _closed = true;
-
- super.close();
-
String content = getBuffer();
_parent.printRaw(content);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
