Commit c1d99767 authored by Carlos Galindo's avatar Carlos Galindo
Browse files

jinterface 1.14

parent 72d8d8dc

README.md

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Available versions: 


| JInterface | Erlang versions supported |

|------------|---------------------------|

| 1.14       | >=26, <26.2               |

| 1.13.2     | >=25.3, <26               |

| 1.13.1     | >=25.1, <25.3             |

| 1.13       | >=25, <25.1               |

java_src/com/ericsson/otp/erlang/AbstractConnection.java

+21 −39
Original line number Diff line number Diff line
@@ -425,29 +425,12 @@ public abstract class AbstractConnection extends Thread { 
        header.write1(passThrough);

        header.write1(version);



        if ((peer.flags & AbstractNode.dFlagUnlinkId) != 0) {

        // header

        header.write_tuple_head(4);

        header.write_long(unlinkIdTag);

        header.write_long(unlink_id);

        header.write_any(from);

        header.write_any(dest);

        }

        else {

            /*

             * A node that isn't capable of talking the new link protocol.

             *

             * Send an old unlink op, and send ourselves an unlink-ack. We may

             * end up in an inconsistent state as we could before the new link

             * protocol was introduced...

             */

            // header

            header.write_tuple_head(3);

            header.write_long(unlinkTag);

            header.write_any(from);

            header.write_any(dest);

            deliver(new OtpMsg(unlinkIdAckTag, dest, from, unlink_id));

        }



        // fix up length in preamble

        header.poke4BE(0, header.size() - 4);
@@ -471,7 +454,7 @@ public abstract class AbstractConnection extends Thread { 
        if (!connected) {

            throw new IOException("Not connected");

        }

        if ((peer.flags & AbstractNode.dFlagUnlinkId) != 0) {



        @SuppressWarnings("resource")

            final OtpOutputStream header = new OtpOutputStream(headerLen);
@@ -490,7 +473,6 @@ public abstract class AbstractConnection extends Thread { 
        header.poke4BE(0, header.size() - 4);



        do_send(header);

        }



    }

java_src/com/ericsson/otp/erlang/AbstractNode.java

+6 −3
Original line number Diff line number Diff line
@@ -111,9 +111,14 @@ public class AbstractNode implements OtpTransportFactory { 
        | dFlagBitBinaries

        | dFlagHandshake23;



    /* New mandatory flags in OTP 26 */

    static final long mandatoryFlags26 = dFlagV4PidsRefs

        | dFlagUnlinkId;

    

    /* Mandatory flags for distribution. Keep them in sync with

       DFLAG_DIST_MANDATORY in erts/emulator/beam/dist.h. */

    static final long mandatoryFlags = mandatoryFlags25;

    static final long mandatoryFlags = mandatoryFlags25

        | mandatoryFlags26;



    int ntype = NTYPE_R6;

    int proto = 0; // tcp/ip
@@ -121,8 +126,6 @@ public class AbstractNode implements OtpTransportFactory { 
    int distLow = 6; // Cannot talk to nodes before OTP 23

    private int creation = 0x710000;

    long flags = mandatoryFlags

        | dFlagUnlinkId

        | dFlagV4PidsRefs

        | dFlagMandatory25Digest;



    /* initialize hostname and default cookie */

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<groupId>program-slicing</groupId>

	<artifactId>erlang-jinterface</artifactId>

	<packaging>jar</packaging>

	<version>1.13.2</version>

	<version>1.14</version>

	<name>jinterface</name>

	<description>

		Jinterface Java package contains java classes, which help you integrate programs written in Java with Erlang.