1 files changed, 11 insertions, 9 deletions
diff --git a/sandbox/wjaniszewski/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingImpl.java b/sandbox/wjaniszewski/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingImpl.java
index ad1bec06d3..9c0e9c82e7 100644
--- a/sandbox/wjaniszewski/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingImpl.java
+++ b/sandbox/wjaniszewski/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingImpl.java
@@ -33,8 +33,6 @@ import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
  */
 public class ErlangBindingImpl implements ErlangBinding, PolicySetAttachPoint {
 
-	public static final long DEFAULT_TIMEOUT = 10000;
-
 	private String node;
 	private String module;
 	private boolean mbox;
@@ -44,7 +42,7 @@ public class ErlangBindingImpl implements ErlangBinding, PolicySetAttachPoint {
 	private List<PolicySet> policySets = new ArrayList<PolicySet>();
 	private IntentAttachPointType intentAttachPointType;
 	private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-	private long timeout = DEFAULT_TIMEOUT;
+	private long timeout = NO_TIMEOUT;
 
 	public String getNode() {
 		return node;
@@ -121,12 +119,8 @@ public class ErlangBindingImpl implements ErlangBinding, PolicySetAttachPoint {
 	}
 
 	public void setTimeout(long timeout) {
-		// NOTE: 0 timeout will cause setting to default
-		if (timeout == 0) {
-			this.timeout = DEFAULT_TIMEOUT;
-		} else {
-			this.timeout = timeout;
-		}
+		// NOTE: not setting timeout or setting it to 0 will cause no timeout
+		this.timeout = timeout;
 	}
 
 	public String getCookie() {
@@ -137,4 +131,12 @@ public class ErlangBindingImpl implements ErlangBinding, PolicySetAttachPoint {
 		this.cookie = cookie;
 	}
 
+	public boolean hasTimeout() {
+		return timeout != ErlangBinding.NO_TIMEOUT;
+	}
+
+	public boolean hasCookie() {
+		return cookie != null && cookie.length() > 0;
+	}
+
 }