Updated Branches: refs/heads/master 3ce1815d6 -> 9728aa25c
Fixing timeout setting issue Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9728aa25 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9728aa25 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9728aa25 Branch: refs/heads/master Commit: 9728aa25c5e090b74be04b0f4f2dffa4c8aadc75 Parents: 3ce1815 Author: Sajith Kariyawasam <[email protected]> Authored: Wed Dec 18 12:39:37 2013 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Wed Dec 18 12:39:37 2013 +0530 ---------------------------------------------------------------------- .../stratos/adc/mgt/client/AutoscalerServiceClient.java | 8 ++++---- .../stratos/adc/mgt/client/CloudControllerServiceClient.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9728aa25/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java index efdad29..4fe2d62 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java @@ -47,15 +47,15 @@ public class AutoscalerServiceClient { String autosclaerSocketTimeout = - (System.getProperty(CartridgeConstants.AUTOSCALER_SOCKET_TIMEOUT) == null ) ? "300000": System.getProperty(CartridgeConstants.AUTOSCALER_SOCKET_TIMEOUT); + System.getProperty(CartridgeConstants.AUTOSCALER_SOCKET_TIMEOUT) == null ? "300000": System.getProperty(CartridgeConstants.AUTOSCALER_SOCKET_TIMEOUT); String autosclaerConnectionTimeout = - (System.getProperty(CartridgeConstants.AUTOSCALER_CONNECTION_TIMEOUT) == null ) ? "300000" : System.getProperty(CartridgeConstants.AUTOSCALER_CONNECTION_TIMEOUT) ; + System.getProperty(CartridgeConstants.AUTOSCALER_CONNECTION_TIMEOUT) == null ? "300000" : System.getProperty(CartridgeConstants.AUTOSCALER_CONNECTION_TIMEOUT) ; ConfigurationContext clientConfigContext = DataHolder.getClientConfigContext(); try { stub = new AutoScalerServiceStub(clientConfigContext, epr); - stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, autosclaerSocketTimeout); - stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, autosclaerConnectionTimeout); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, new Integer(autosclaerSocketTimeout)); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, new Integer(autosclaerConnectionTimeout)); } catch (AxisFault axisFault) { String msg = "Failed to initiate autoscaler service client. " + axisFault.getMessage(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9728aa25/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java index d9ccab3..3105c10 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java @@ -51,13 +51,13 @@ public class CloudControllerServiceClient { String ccSocketTimeout = System.getProperty(CartridgeConstants.CC_SOCKET_TIMEOUT) == null ? "300000" : System.getProperty(CartridgeConstants.CC_SOCKET_TIMEOUT); String ccConnectionTimeout = - System.getProperty(CartridgeConstants.CC_CONNECTION_TIMEOUT) == null ? "300000" : System.getProperty(CartridgeConstants.CC_CONNECTION_TIMEOUT) ; + System.getProperty(CartridgeConstants.CC_CONNECTION_TIMEOUT) == null ? "300000" : System.getProperty(CartridgeConstants.CC_CONNECTION_TIMEOUT); ConfigurationContext clientConfigContext = DataHolder.getClientConfigContext(); try { stub = new CloudControllerServiceStub(clientConfigContext, epr); - stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, ccSocketTimeout); - stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, ccConnectionTimeout); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, new Integer(ccSocketTimeout)); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, new Integer(ccConnectionTimeout)); } catch (AxisFault axisFault) { String msg = "Failed to initiate AutoscalerService client. " + axisFault.getMessage();
