Author: objectiser Date: 2010-01-29 13:24:50 -0500 (Fri, 29 Jan 2010) New Revision: 484 Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/test.endpoint trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java Log: RIFTSAW-156 - update to enable service and port name to be used to refer to specific endpoint configuration info. Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/test.endpoint =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/test.endpoint 2010-01-29 16:22:52 UTC (rev 483) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/bpel/test.endpoint 2010-01-29 18:24:50 UTC (rev 484) @@ -1,4 +1,10 @@ # 3 minutes -mex.timeout=180000 +# mex.timeout=180000 +alias.test_ns=http://www.jboss.org/bpel/examples/wsdl + +# test_ns.HelloExtendedTimeoutService.ode.mex.timeout=180000 + +test_ns.HelloExtendedTimeoutService.HelloExtendedTimeoutPort.ode.mex.timeout=180000 + 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-01-29 16:22:52 UTC (rev 483) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-01-29 18:24:50 UTC (rev 484) @@ -279,10 +279,10 @@ } private long resolveTimeout(InvocationAdapter invocationAdapter, MyRoleMessageExchange odeMex) { - EndpointReference serviceRef=_endpointRefResolver.getEndpoint(invocationAdapter.getServiceName(), invocationAdapter.getPortName()); + //EndpointReference serviceRef=_endpointRefResolver.getEndpoint(invocationAdapter.getServiceName(), invocationAdapter.getPortName()); ProcessConf conf=odeMex.getProcessConf(); - String timeout = conf.getEndpointProperties(serviceRef).get(Properties.PROP_MEX_TIMEOUT); + String timeout = conf.getEndpointProperties(invocationAdapter.getServiceName(), invocationAdapter.getPortName()).get(Properties.PROP_MEX_TIMEOUT); if (timeout != null) { try {