Author: lwaterman
Date: Mon Nov 27 08:39:07 2006
New Revision: 479683
URL: http://svn.apache.org/viewvc?view=rev&rev=479683
Log:
Fix NPE
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java?view=diff&rev=479683&r1=479682&r2=479683
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
Mon Nov 27 08:39:07 2006
@@ -21,7 +21,9 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
@@ -159,10 +161,16 @@
}
public XmlDataDAO getVariable(String varName) {
+ XmlDataDAO ret = null;
+
for (XmlDataDAO xmlElement : _variables) {
if ( xmlElement.getName().equals(varName)) return
xmlElement;
}
- return null;
+
+ ret = new XmlDataDAOImpl(this,varName);
+ _variables.add(ret);
+
+ return ret;
}
public Collection<XmlDataDAO> getVariables() {
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java?view=diff&rev=479683&r1=479682&r2=479683
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java
Mon Nov 27 08:39:07 2006
@@ -55,12 +55,18 @@
@Basic @Column(name="IS_SIMPLE_TYPE") private boolean _isSimpleType;
@Basic @Column(name="IS_NULL") private boolean _isNull;
@Basic @Column(name="NAME") private String _name;
- @Basic @Column(name="PROPERTIES") private Properties _props;
+ @Basic @Column(name="PROPERTIES") private Properties _props = new
Properties();
@Version @Column(name="VERSION") private long _version;
@ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST})
@Column(name="SCOPE_ID")
private ScopeDAOImpl _scope;
+
+ public XmlDataDAOImpl() {}
+ public XmlDataDAOImpl(ScopeDAOImpl scope, String name){
+ _scope = scope;
+ _name = name;
+ }
public Node get() {
if ( _node == null && _data != null ) {
