Projects >> jSCSI >>4b5256bdada3eb657d771f94fa9ae04e7256fb20

Chunk
Conflicting content 
                running = false;
                break;
            default:
<<<<<<< HEAD
                LOGGER.error("Recieved unsupported opcode for " + pdu.getBasicHeaderSegment().getOpCode());
                stage = new UnsupportedOpCodeStage(this);
=======
                System.out.println("====================");
                System.out.println(bhs.getOpCode().name());
                // System.out.println(bhs.getParser().getClass().toString());
                System.out.println("====================");
                throw new InternetSCSIException(bhs.getOpCode().name() + " not recognized.");
>>>>>>> 9afd21bc19f204143402eb89215e04cb625d5c55
            }

            // process the PDU
Solution content 
            default:
                LOGGER.error("Recieved unsupported opcode for " + pdu.getBasicHeaderSegment().getOpCode());
                stage = new UnsupportedOpCodeStage(this);
            }

            // process the PDU
File
TargetFullFeaturePhase.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Throw statement