diff options
author | Vlad Dumitrescu <[email protected]> | 2014-09-10 10:59:08 +0200 |
---|---|---|
committer | Vlad Dumitrescu <[email protected]> | 2014-09-11 21:24:21 +0200 |
commit | 99487b09478c2a6476f7f2b137f8b7a2a472794b (patch) | |
tree | 8c38bfc01944d9ac42d823e3e2a89971d19019e2 /lib/jinterface/java_src/com | |
parent | 790728fc740af676d6fc6671355af0f5ffcfb530 (diff) | |
download | otp-99487b09478c2a6476f7f2b137f8b7a2a472794b.tar.gz otp-99487b09478c2a6476f7f2b137f8b7a2a472794b.tar.bz2 otp-99487b09478c2a6476f7f2b137f8b7a2a472794b.zip |
rename OtpNode.flags to connFlags
was colliding to AbstractNode.flags
Diffstat (limited to 'lib/jinterface/java_src/com')
-rw-r--r-- | lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java index c2596496de..b214c8b9fa 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java @@ -74,7 +74,7 @@ public class OtpNode extends OtpLocalNode { OtpNodeStatus handler; // flags - private int flags = 0; + private int connFlags = 0; /** * <p> @@ -495,7 +495,7 @@ public class OtpNode extends OtpLocalNode { if (conn == null) { try { conn = new OtpCookedConnection(this, peer); - conn.setFlags(flags); + conn.setFlags(connFlags); addConnection(conn); } catch (final Exception e) { /* false = outgoing */ @@ -770,7 +770,7 @@ public class OtpNode extends OtpLocalNode { try { synchronized (connections) { conn = new OtpCookedConnection(OtpNode.this, newsock); - conn.setFlags(flags); + conn.setFlags(connFlags); addConnection(conn); } } catch (final OtpAuthException e) { @@ -801,6 +801,6 @@ public class OtpNode extends OtpLocalNode { } public void setFlags(final int flags) { - this.flags = flags; + this.connFlags = flags; } } |