Repository: ode Updated Branches: refs/heads/ode-1.3.x 629825167 -> d5f4fe1d0
Fixed errors occurring during random execution of test methods in VersionedRedployTest and BasicActivities20Test Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/d5f4fe1d Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/d5f4fe1d Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/d5f4fe1d Branch: refs/heads/ode-1.3.x Commit: d5f4fe1d0c05b2689c7724b33569d18878a6633a Parents: 6298251 Author: sathwik <[email protected]> Authored: Tue Oct 21 16:53:02 2014 +0530 Committer: sathwik <[email protected]> Committed: Tue Oct 21 16:53:02 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/ode/bpel/engine/Contexts.java | 2 +- .../ode/bpel/memdao/BpelDAOConnectionFactoryImpl.java | 2 +- .../org/apache/ode/test/VersionedRedeployTest.java | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/d5f4fe1d/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java index f39e2f3..53dc58b 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java @@ -51,7 +51,7 @@ public class Contexts { BindingContext bindingContext; public BpelDAOConnectionFactory dao; - BpelDAOConnectionFactory inMemDao; + public BpelDAOConnectionFactory inMemDao; /** Global Message-Exchange interceptors. Must be copy-on-write!!! */ final List<MessageExchangeInterceptor >globalInterceptors = new CopyOnWriteArrayList<MessageExchangeInterceptor>(); http://git-wip-us.apache.org/repos/asf/ode/blob/d5f4fe1d/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionFactoryImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionFactoryImpl.java index b4aea8a..9dbe3d5 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionFactoryImpl.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionFactoryImpl.java @@ -32,7 +32,7 @@ import java.util.Properties; * Connection factory for the in-memory state store. */ public class BpelDAOConnectionFactoryImpl implements BpelDAOConnectionFactory { - private static final Map<QName, ProcessDaoImpl> __StateStore = new HashMap<QName, ProcessDaoImpl>(); + private final Map<QName, ProcessDaoImpl> __StateStore = new HashMap<QName, ProcessDaoImpl>(); private Scheduler _scheduler; private long _mexTtl = 10*60*1000; http://git-wip-us.apache.org/repos/asf/ode/blob/d5f4fe1d/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java ---------------------------------------------------------------------- diff --git a/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java b/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java index 37ec75b..0776031 100644 --- a/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java +++ b/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java @@ -63,24 +63,24 @@ public class VersionedRedeployTest extends BPELTestAbstract { // Checking for each step that all instances still exist and that each process got one execution // so no instance has been created after a process has been retired. go("/bpel/2.0/TestVersionedRedeploy/HelloWorld-1"); - Assert.assertEquals(1, _cf.getConnection().getProcess(qName1).getNumInstances()); + Assert.assertEquals(1, _server.getContexts().inMemDao.getConnection().getProcess(qName1).getNumInstances()); // clean up deployment and invocations _deployments.clear(); _invocations.clear(); go("/bpel/2.0/TestVersionedRedeploy/HelloWorld-2"); - Assert.assertEquals(1, _cf.getConnection().getProcess(qName1).getNumInstances()); - Assert.assertEquals(1, _cf.getConnection().getProcess(qName2).getNumInstances()); + Assert.assertEquals(1, _server.getContexts().inMemDao.getConnection().getProcess(qName1).getNumInstances()); + Assert.assertEquals(1, _server.getContexts().inMemDao.getConnection().getProcess(qName2).getNumInstances()); // clean up deployment and invocations _deployments.clear(); _invocations.clear(); go("/bpel/2.0/TestVersionedRedeploy/HelloWorld-3"); - Assert.assertEquals(1, _cf.getConnection().getProcess(qName1).getNumInstances()); - Assert.assertEquals(1, _cf.getConnection().getProcess(qName2).getNumInstances()); - Assert.assertEquals(1, _cf.getConnection().getProcess(qName3).getNumInstances()); + Assert.assertEquals(1, _server.getContexts().inMemDao.getConnection().getProcess(qName1).getNumInstances()); + Assert.assertEquals(1, _server.getContexts().inMemDao.getConnection().getProcess(qName2).getNumInstances()); + Assert.assertEquals(1, _server.getContexts().inMemDao.getConnection().getProcess(qName3).getNumInstances()); } @Test public void testVersionedUndeployDeploy() throws Throwable { @@ -95,7 +95,7 @@ public class VersionedRedeployTest extends BPELTestAbstract { Assert.assertNull(store.getProcessConfiguration(qName1)); Assert.assertNull(store.getProcessConfiguration(qName3)); - Assert.assertEquals(1, _cf.getConnection().getProcess(qName2).getNumInstances()); + Assert.assertEquals(1, _server.getContexts().inMemDao.getConnection().getProcess(qName2).getNumInstances()); } }
