Author: nbubna
Date: Mon Sep 19 14:47:01 2005
New Revision: 290281
URL: http://svn.apache.org/viewcvs?rev=290281&view=rev
Log:
make DataInfo more stable in an 'uninitialized' state (thanks to Henning for
pointing out the problem)
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/DataInfo.java
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/DataInfo.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/DataInfo.java?rev=290281&r1=290280&r2=290281&view=diff
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/DataInfo.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/DataInfo.java
Mon Sep 19 14:47:01 2005
@@ -45,7 +45,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Nathan Bubna</a>
*
- * @version $Id: DataInfo.java,v 1.5 2004/02/18 20:08:29 nbubna Exp $
+ * @version $Id$
*/
public class DataInfo implements ToolInfo
{
@@ -58,9 +58,9 @@
private static final int TYPE_ID_NUMBER = 1;
private static final int TYPE_ID_BOOLEAN = 2;
- private String key;
- private int type_id;
- private Object data;
+ private String key = null;
+ private int type_id = TYPE_ID_STRING;
+ private Object data = null;
public DataInfo() {}
@@ -125,7 +125,7 @@
public String getClassname()
{
- return data.getClass().getName();
+ return data != null ? data.getClass().getName() : null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
