You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2007/11/14 17:06:59 UTC
svn commit: r594926 - in
/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc:
DbExternalVariable.java JdbcExternalVariableModule.java
Author: mszefler
Date: Wed Nov 14 08:06:57 2007
New Revision: 594926
URL: http://svn.apache.org/viewvc?rev=594926&view=rev
Log:
Fixed unmerged bug.
Modified:
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java
Modified: ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java?rev=594926&r1=594925&r2=594926&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/DbExternalVariable.java Wed Nov 14 08:06:57 2007
@@ -134,7 +134,7 @@
s = locator.get(kc.name);
}
- Object rv = rowval == null ? null : rowval.get(kc.name);
+ Object rv = rowval == null ? null : kc.getValue(rowval, locator.iid);
if (s == null && rv == null) {
throw new IncompleteKeyException(Collections.singleton(kc.name));
} else if (s != null && rv != null) {
@@ -309,7 +309,7 @@
elname = new QName(null, name);
}
- public Object getValue(String name, RowVal values, Long iid) {
+ public Object getValue(RowVal values, Long iid) {
switch (genType) {
case ctimestamp:
case utimestamp:
Modified: ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java?rev=594926&r1=594925&r2=594926&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableModule.java Wed Nov 14 08:06:57 2007
@@ -362,7 +362,7 @@
.prepareStatement(dbev.insert);
int idx = 1;
for (Column c : dbev.inscolumns) {
- Object val = c.getValue(c.name, values, null);
+ Object val = c.getValue(values, null);
values.put(c.name, val);
stmt.setObject(idx, val);
idx++;