Author: kwall
Date: Sun Jan 12 18:52:51 2014
New Revision: 1557591
URL: http://svn.apache.org/r1557591
Log:
QPID-5472: [Java Broker] Exceptions used to report bind port failure
(AMQP/HTTP) now includes port id/name/number too
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java?rev=1557591&r1=1557590&r2=1557591&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
Sun Jan 12 18:52:51 2014
@@ -19,9 +19,6 @@
*/
package org.apache.qpid.server.model.adapter;
-import static org.apache.qpid.transport.ConnectionSettings.WILDCARD_ADDRESS;
-
-import java.net.InetSocketAddress;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.Collection;
@@ -41,7 +38,6 @@ import org.apache.qpid.server.logging.ac
import org.apache.qpid.server.logging.messages.BrokerMessages;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.KeyStore;
-import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.TrustStore;
@@ -204,9 +200,4 @@ public class AmqpPortAdapter extends Por
}
return null;
}
-
- public String toString()
- {
- return getName();
- }
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java?rev=1557591&r1=1557590&r2=1557591&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
Sun Jan 12 18:52:51 2014
@@ -556,4 +556,11 @@ public class PortAdapter extends Abstrac
return trustStores;
}
+
+ @Override
+ public String toString()
+ {
+ return getClass().getSimpleName() + " [id=" + getId() + ", name=" +
getName() + ", port=" + getPort() + "]";
+ }
+
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java?rev=1557591&r1=1557590&r2=1557591&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java
Sun Jan 12 18:52:51 2014
@@ -136,5 +136,11 @@ class TCPandSSLTransport implements Acce
{
return _bindingSocketAddress;
}
+
+ @Override
+ public String toString()
+ {
+ return _port.toString();
+ }
}
}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1557591&r1=1557590&r2=1557591&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Sun Jan 12 18:52:51 2014
@@ -182,7 +182,7 @@ public class HttpManagement extends Abst
}
catch (Exception e)
{
- throw new RuntimeException("Failed to start http management on
ports " + httpPorts);
+ throw new RuntimeException("Failed to start HTTP management on
ports : " + httpPorts, e);
}
CurrentActor.get().message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
@@ -199,7 +199,7 @@ public class HttpManagement extends Abst
}
catch (Exception e)
{
- throw new RuntimeException("Failed to stop http management on
port " + getHttpPorts(getBroker().getPorts()));
+ throw new RuntimeException("Failed to stop HTTP management on
ports : " + getHttpPorts(getBroker().getPorts()));
}
}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java?rev=1557591&r1=1557590&r2=1557591&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
Sun Jan 12 18:52:51 2014
@@ -146,7 +146,7 @@ public class IoNetworkTransport implemen
}
catch (IOException e)
{
- throw new TransportException("Unable to start server socket", e);
+ throw new TransportException("Failed to start AMQP on port : " +
config, e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
