Author: rr
Date: Tue Dec 1 16:16:29 2009
New Revision: 885815
URL: http://svn.apache.org/viewvc?rev=885815&view=rev
Log:
ODE-567: Fix for test failures
Modified:
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/deploy.xml
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.bpel
Modified:
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=885815&r1=885814&r2=885815&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Tue Dec 1 16:16:29 2009
@@ -187,6 +187,20 @@
// Override the package name if given from the parameter
du.setName(duName);
}
+
+ long version;
+ if (autoincrementVersion || du.getStaticVersion() == -1) {
+ // Process and DU use a monotonically increased single version
number by default.
+ version = exec(new Callable<Long>() {
+ public Long call(ConfStoreConnection conn) {
+ return conn.getNextVersion();
+ }
+ });
+ } else {
+ version = du.getStaticVersion();
+ }
+ du.setVersion(version);
+
try {
du.compile();
} catch (CompilationException ce) {
@@ -201,18 +215,6 @@
Collection<QName> deployed;
_rw.writeLock().lock();
- long version;
- if (autoincrementVersion || du.getStaticVersion() == -1) {
- // Process and DU use a monotonically increased single version
number by default.
- version = exec(new Callable<Long>() {
- public Long call(ConfStoreConnection conn) {
- return conn.getNextVersion();
- }
- });
- } else {
- version = du.getStaticVersion();
- }
- du.setVersion(version);
try {
if (_deploymentUnits.containsKey(du.getName())) {
Modified:
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/deploy.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/deploy.xml?rev=885815&r1=885814&r2=885815&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/deploy.xml
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/deploy.xml
Tue Dec 1 16:16:29 2009
@@ -23,7 +23,7 @@
xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl";>
- <process name="pns:TestCorrelationProcess">
+ <process name="pns:TestCorrelationNegativeProcess">
<active>true</active>
<provide partnerLink="request">
<service name="wns:testCorrelationService"
port="wns:testCorrelationPort"/>
Modified:
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.bpel
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.bpel?rev=885815&r1=885814&r2=885815&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.bpel
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.bpel
Tue Dec 1 16:16:29 2009
@@ -22,7 +22,7 @@
xmlns:tns="http://ode/bpel/unit-test/testCorrelation";
xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl";
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
- name="TestCorrelationProcess"
+ name="TestCorrelationNegativeProcess"
targetNamespace="http://ode/bpel/unit-test/testCorrelation";
queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
