Projects >> Fido4Java >>0b47f9132814aee823562aa03de490bd5ec3fa39

Chunk
Conflicting content 
import org.fidonet.config.Config;
import org.fidonet.echobase.EchoMgr;
<<<<<<< HEAD:src/main/java/org/fidonet/jftn/tosser/Tosser.java
import org.fidonet.fts.ftsPackMsg;
import org.fidonet.fts.ftsPkt;
import org.fidonet.jftn.event.HasEventBus;
=======
import org.fidonet.fts.FtsPackMsg;
import org.fidonet.fts.FtsPkt;
>>>>>>> 9cd7f7c06b821a69af8cfe0cadec30d6319f900c:src/main/java/org/fidonet/tosser/Tosser.java
import org.fidonet.misc.Logger;
import org.fidonet.misc.PktTemp;
import org.fidonet.misc.Zipper;
Solution content 
import org.fidonet.config.Config;
import org.fidonet.echobase.EchoMgr;
import org.fidonet.fts.FtsPackMsg;
import org.fidonet.fts.FtsPkt;
import org.fidonet.jftn.event.HasEventBus;
import org.fidonet.misc.Logger;
import org.fidonet.misc.PktTemp;
import org.fidonet.misc.Zipper;
File
Tosser.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        inf.delete();
    }*/

<<<<<<< HEAD:src/main/java/org/fidonet/jftn/tosser/Tosser.java
    private boolean tosspkt(ByteBuffer buf) {
        final ftsPkt q = new ftsPkt(buf);
=======
    private static boolean tosspkt(ByteBuffer buf) {
        final FtsPkt q = new FtsPkt(buf);
>>>>>>> 9cd7f7c06b821a69af8cfe0cadec30d6319f900c:src/main/java/org/fidonet/tosser/Tosser.java
        Link origlink = Config.getLink(q.getOrigaddr());
        if (origlink == null) {
            Logger.Error("Unknown Link! Drop it.");
Solution content 
        inf.delete();
    }*/

    private static boolean tosspkt(ByteBuffer buf) {
        final FtsPkt q = new FtsPkt(buf);
        Link origlink = Config.getLink(q.getOrigaddr());
        if (origlink == null) {
            Logger.Error("Unknown Link! Drop it.");
File
Tosser.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
            Logger.Error("Bad PASSWORD! Drop it.");
            return false;
        }
<<<<<<< HEAD:src/main/java/org/fidonet/jftn/tosser/Tosser.java
        final ftsPackMsg[] msgs = q.getMsgs();
        for (ftsPackMsg msg1 : msgs) {
=======

        final FtsPackMsg[] msgs = q.getMsgs();
        for (FtsPackMsg msg1 : msgs) {
>>>>>>> 9cd7f7c06b821a69af8cfe0cadec30d6319f900c:src/main/java/org/fidonet/tosser/Tosser.java
            final Message msg = new Message(msg1);
            if (msg.isEchomail()) {
                processEchoMail(msg);
Solution content 
            Logger.Error("Bad PASSWORD! Drop it.");
            return false;
        }

        final FtsPackMsg[] msgs = q.getMsgs();
        for (FtsPackMsg msg1 : msgs) {
            final Message msg = new Message(msg1);
            if (msg.isEchomail()) {
                processEchoMail(msg);
File
Tosser.java
Developer's decision
Version 2
Kind of conflict
For statement
Method invocation
Variable