OnPublicNetworkEnricher: valid string port is in range Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5e2690e0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5e2690e0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5e2690e0
Branch: refs/heads/master Commit: 5e2690e08d2ed1111ddd955e83b93a2fff792a91 Parents: 567b2ac Author: Aled Sage <aled.s...@gmail.com> Authored: Fri Jun 10 13:50:45 2016 +0100 Committer: Aled Sage <aled.s...@gmail.com> Committed: Fri Jun 10 13:50:45 2016 +0100 ---------------------------------------------------------------------- .../apache/brooklyn/core/network/AbstractOnNetworkEnricher.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5e2690e0/core/src/main/java/org/apache/brooklyn/core/network/AbstractOnNetworkEnricher.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/network/AbstractOnNetworkEnricher.java b/core/src/main/java/org/apache/brooklyn/core/network/AbstractOnNetworkEnricher.java index ff8f278..8bd91d9 100644 --- a/core/src/main/java/org/apache/brooklyn/core/network/AbstractOnNetworkEnricher.java +++ b/core/src/main/java/org/apache/brooklyn/core/network/AbstractOnNetworkEnricher.java @@ -257,7 +257,10 @@ public abstract class AbstractOnNetworkEnricher extends AbstractEnricher { if (sensorVal instanceof Integer || sensorVal instanceof Long) { return Networking.isPortValid(((Number)sensorVal).intValue()); } else if (sensorVal instanceof CharSequence) { - return sensorVal.toString().trim().matches("[0-9]+"); + String val = sensorVal.toString().trim(); + return val.matches("[0-9]+") && val.length() <= 5 + && Networking.isPortValid(Integer.parseInt(val)); + } else { return false; }
