mvdb 2002/06/14 14:39:16
Modified: betwixt/src/java/org/apache/commons/betwixt/io
BeanCreateRule.java
betwixt/xdocs todo.xml
Log:
Fixed the annoying Emptty stack Digester warning (was on the todo list). Also fixed
the todo list along with it (typo)..
Revision Changes Path
1.3 +5 -1
jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java
Index: BeanCreateRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanCreateRule.java 11 Jun 2002 16:05:21 -0000 1.2
+++ BeanCreateRule.java 14 Jun 2002 21:39:16 -0000 1.3
@@ -169,7 +169,11 @@
Object instance = context.getBean();
Object top = digester.pop();
- context.setBean( digester.peek() );
+ if (digester.getCount() == 0) {
+ context.setBean(null);
+ }else{
+ context.setBean( digester.peek() );
+ }
if ( updater != null ) {
if ( log.isDebugEnabled() ) {
1.7 +2 -1 jakarta-commons/betwixt/xdocs/todo.xml
Index: todo.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/betwixt/xdocs/todo.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- todo.xml 14 Jun 2002 04:29:30 -0000 1.6
+++ todo.xml 14 Jun 2002 21:39:16 -0000 1.7
@@ -14,12 +14,13 @@
</p>
- <secton name="High priority">
+ <section name="High priority">
<ul>
<li>
If an addFoo() method is found with no matching getFoos() then a
warning should be generated.
</li>
<li>
+ <b>Fixed.</b> digester.peek() was giving warning. Now checking if it
still has something to peek.
Currently betwixt causes digester to output a warning '[WARN]
Digester - -Empty stack (returning null)'.
We should patch the way betwixt uses digester to avoid this warning
message.
</li>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
