Author: objectiser Date: 2010-11-09 14:14:46 -0500 (Tue, 09 Nov 2010) New Revision: 1096 Modified: trunk/distribution/src/main/release/ReleaseNotes.txt trunk/integration-tests/pom.xml trunk/pom.xml trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java Log: Backing out changes related to RIFTSAW-238, which is causing npe, details logged under RIFTSAW-316. Modified: trunk/distribution/src/main/release/ReleaseNotes.txt =================================================================== --- trunk/distribution/src/main/release/ReleaseNotes.txt 2010-11-09 19:03:12 UTC (rev 1095) +++ trunk/distribution/src/main/release/ReleaseNotes.txt 2010-11-09 19:14:46 UTC (rev 1096) @@ -23,6 +23,7 @@ Know issues: 1. RIFTSAW-198 : CronScheduler is not supporting cluster 2. RIFTSAW-316 : exception when WSDL service has multiple ports +3. RIFTSAW-238 : Undeploying active process unpublishes webservice, even when retired processes still exist with active instances RiftSaw 2.2.0.M1 Modified: trunk/integration-tests/pom.xml =================================================================== --- trunk/integration-tests/pom.xml 2010-11-09 19:03:12 UTC (rev 1095) +++ trunk/integration-tests/pom.xml 2010-11-09 19:14:46 UTC (rev 1096) @@ -591,7 +591,6 @@ <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude> <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude> <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude> -<exclude>org/jboss/soa/bpel/tests/testcases/RiftSaw296TestCase.java</exclude> </excludes> </configuration> <executions> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-09 19:03:12 UTC (rev 1095) +++ trunk/pom.xml 2010-11-09 19:14:46 UTC (rev 1096) @@ -471,7 +471,7 @@ <repository> <id>riftsaw-ode-2.2.0.CR1</id> <name>riftsaw-ode 2.2.0.CR1</name> - <url>https://repository.jboss.org/nexus/content/repositories/jboss_rele... + <url>https://repository.jboss.org/nexus/content/repositories/jboss_rele... </repository> </repositories> Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-11-09 19:03:12 UTC (rev 1095) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-11-09 19:14:46 UTC (rev 1096) @@ -648,12 +648,7 @@ break; case DISABLED: case UNDEPLOYED: - List<String> retireProcess = _store.getPreviousPackageVersions(pse.deploymentUnit); - boolean deactivateEndpoints = true; - if (retireProcess.size() > 0) { - deactivateEndpoints = false; - } - _bpelServer.unregister(pse.pid, deactivateEndpoints); + _bpelServer.unregister(pse.pid); if (pconf != null) { _bpelServer.cleanupProcess(pconf); }