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/04/06 14:02:20 UTC
svn commit: r1790408 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/model/port/
broker-plugins/management-http/src/main/java/resources/
broker-plugins/management-http/src/main/java/resources/js/qpid/management/
Author: kwall
Date: Thu Apr 6 14:02:20 2017
New Revision: 1790408
URL: http://svn.apache.org/viewvc?rev=1790408&view=rev
Log:
QPID-7735: [Java Broker] Ensure that a newly created non-dynamically assign port does not conflict with existing dynamically assigned one.
Also added bound port to the broker tab and port tab.
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showPort.html
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java?rev=1790408&r1=1790407&r2=1790408&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java Thu Apr 6 14:02:20 2017
@@ -117,16 +117,19 @@ public abstract class AbstractPort<X ext
throw new IllegalArgumentException(getClass().getSimpleName() + " must be durable");
}
- for (Port p : _container.getChildren(Port.class))
+ if (getPort() != 0)
{
- if (p.getPort() == getPort() && p.getPort() != 0 && p != this)
+ for (Port p : _container.getChildren(Port.class))
{
- throw new IllegalConfigurationException("Can't add port "
- + getName()
- + " because port number "
- + getPort()
- + " is already configured for port "
- + p.getName());
+ if (p != this && (p.getPort() == getPort() || p.getBoundPort() == getPort()))
+ {
+ throw new IllegalConfigurationException("Can't add port "
+ + getName()
+ + " because port number "
+ + getPort()
+ + " is already configured for port "
+ + p.getName());
+ }
}
}
}
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1790408&r1=1790407&r2=1790408&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Thu Apr 6 14:02:20 2017
@@ -560,7 +560,7 @@ define(["dojo/parser",
}, {
name: "State",
field: "state",
- width: "15%"
+ width: "10%"
}, {
name: "Auth Provider",
field: "authenticationProvider",
@@ -572,7 +572,7 @@ define(["dojo/parser",
}, {
name: "Port",
field: "port",
- width: "10%"
+ width: "5%"
}, {
name: "Transports",
field: "transports",
@@ -580,7 +580,15 @@ define(["dojo/parser",
}, {
name: "Protocols",
field: "protocols",
- width: "15%"
+ width: "20%"
+ }, {
+ name: "Bound Port",
+ field: "boundPort",
+ width: "5%",
+ formatter: function (val)
+ {
+ return val > -1 ? val : "-";
+ }
}], function (obj)
{
connect.connect(obj.grid, "onRowDblClick", obj.grid, function (evt)
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js?rev=1790408&r1=1790407&r2=1790408&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js Thu Apr 6 14:02:20 2017
@@ -142,6 +142,7 @@ define(["dojo/dom",
"stateValue",
"typeValue",
"portValue",
+ "boundPortValue",
"authenticationProviderValue",
"protocolsValue",
"transportsValue",
@@ -190,6 +191,8 @@ define(["dojo/dom",
this.stateValue.innerHTML = entities.encode(String(this.portData["state"]));
this.typeValue.innerHTML = entities.encode(String(this.portData["type"]));
this.portValue.innerHTML = entities.encode(String(this.portData["port"]));
+ this.boundPortValue.innerHTML = this.portData["boundPort"] > -1 ? entities.encode(String(this.portData["boundPort"])) : "(not bound)";
+ this.portValue.innerHTML = entities.encode(String(this.portData["port"]));
this.authenticationProviderValue.innerHTML = this.portData["authenticationProvider"]
? entities.encode(String(this.portData["authenticationProvider"]))
: "";
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showPort.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showPort.html?rev=1790408&r1=1790407&r2=1790408&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showPort.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showPort.html Thu Apr 6 14:02:20 2017
@@ -51,6 +51,11 @@
<div class="formValue-valueCell portValue"></div>
</div>
+ <div class="clear port">
+ <div class="formLabel-labelCell">Bound Port Number:</div>
+ <div class="formValue-valueCell boundPortValue"></div>
+ </div>
+
<div class="clear protocols">
<div class="formLabel-labelCell">Protocols:</div>
<div class="formValue-valueCell protocolsValue multiLineValue"></div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org