change from TypeCoercion to prevent runtime error
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7296fa18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7296fa18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7296fa18 Branch: refs/heads/master Commit: 7296fa185fac13c649612880e14a2125761acf34 Parents: 5543f97 Author: Robert Moss <[email protected]> Authored: Thu Apr 16 17:55:04 2015 +0100 Committer: Robert Moss <[email protected]> Committed: Thu Apr 16 17:55:04 2015 +0100 ---------------------------------------------------------------------- .../java/brooklyn/entity/basic/SoftwareProcessImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7296fa18/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java index 9efd186..69b20b2 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java +++ b/software/base/src/main/java/brooklyn/entity/basic/SoftwareProcessImpl.java @@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import com.google.common.collect.Sets; import brooklyn.config.ConfigKey; @@ -444,10 +445,11 @@ public abstract class SoftwareProcessImpl extends AbstractEntity implements Soft if (PortRange.class.isAssignableFrom(k.getType())) { PortRange p = (PortRange)getConfig(k); if (p != null && !p.isEmpty()) ports.add(p.iterator().next()); - } - if(k.getName().matches(".*\\.port")){ - Integer value = TypeCoercions.coerce(getConfig(k), Integer.class); - if (value !=null)ports.add(value); + } else if(k.getName().matches(".*\\.port")){ + Object value = getConfig(k); + if (value instanceof Integer){ + ports.add((Integer)value); + } } }
