[cvs] expresso commit by lhamel: protect against NPE
JCorporate Ltd
jcorp at jcorporate.com
Sun Jul 24 22:06:23 UTC 2005
Log Message:
-----------
protect against NPE
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
Input.java
Revision Data
-------------
Index: Input.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java -u -r1.37 -r1.38
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java
@@ -67,10 +67,6 @@
*/
package com.jcorporate.expresso.core.controller;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
import com.jcorporate.expresso.core.cache.Cacheable;
import com.jcorporate.expresso.core.dbobj.ValidValue;
import com.jcorporate.expresso.core.misc.ConfigManager;
@@ -80,6 +76,11 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
/**
* An Input object is one of the three types of objects generated by a
@@ -310,7 +311,7 @@
*/
public String getDefaultValue() {
String result = "";
- if (defaultValue != null) {
+ if (defaultValue != null && defaultValue.size() > 0) {
result = (String) defaultValue.get(0);
}
More information about the cvs
mailing list