You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/03/09 15:28:45 UTC
svn commit: r1786189 -
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java
Author: kwall
Date: Thu Mar 9 15:28:45 2017
New Revision: 1786189
URL: http://svn.apache.org/viewvc?rev=1786189&view=rev
Log:
QPID-7682: [CloudFoundry] Distinguish between network/read time out and other failures.
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java?rev=1786189&r1=1786188&r2=1786189&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java Thu Mar 9 15:28:45 2017
@@ -29,6 +29,7 @@ import static org.apache.qpid.server.uti
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
+import java.net.SocketTimeoutException;
import java.net.URI;
import java.net.URL;
import java.nio.charset.StandardCharsets;
@@ -60,6 +61,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.group.GroupPrincipal;
import org.apache.qpid.server.util.ConnectionBuilder;
import org.apache.qpid.server.util.ExternalServiceException;
+import org.apache.qpid.server.util.ExternalServiceTimeoutException;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
/*
@@ -221,6 +223,11 @@ public class CloudFoundryDashboardManage
connection.connect();
}
+ catch (SocketTimeoutException e)
+ {
+ throw new ExternalServiceTimeoutException(String.format("Timed out trying to connect to CloudFoundryDashboardManagementEndpoint '%s'.",
+ cloudFoundryEndpoint), e);
+ }
catch (IOException e)
{
throw new ExternalServiceException(String.format("Could not connect to CloudFoundryDashboardManagementEndpoint '%s'.",
@@ -242,12 +249,17 @@ public class CloudFoundryDashboardManage
}
catch (JsonProcessingException e)
{
- throw new ExternalServiceException(String.format("CloudFoundryDashboardManagementEndpoint '%s' did not return json",
+ throw new ExternalServiceException(String.format("CloudFoundryDashboardManagementEndpoint '%s' did not return json.",
cloudFoundryEndpoint), e);
}
+ catch (SocketTimeoutException e)
+ {
+ throw new ExternalServiceTimeoutException(String.format("Timed out reading from CloudFoundryDashboardManagementEndpoint '%s'.",
+ cloudFoundryEndpoint), e);
+ }
catch (IOException e)
{
- throw new ExternalServiceException(String.format("Connection to CloudFoundryDashboardManagementEndpoint '%s' failed",
+ throw new ExternalServiceException(String.format("Connection to CloudFoundryDashboardManagementEndpoint '%s' failed.",
cloudFoundryEndpoint), e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org