Projects >> yamcs >>5beffe0b96a3d9aed959ed57d36160ace935e36c

Chunk
Conflicting content 
        if(tmPacketProvider!=null) {
            tmPacketProvider.awaitRunning();
        }
<<<<<<< HEAD
        if(tmProcessor!=null) {
            tmProcessor.awaitRunning();
        }
        
        notifyStarted();
        propagateProcessorStateChange();        
=======
        notifyStarted();
        propagateProcessorStateChange();
>>>>>>> 5f11f7fb1b5f39799db6d91d5280b7ea768fb303
    }

    private void startIfNecessary(Service service) {
Solution content 
        if(tmPacketProvider!=null) {
            tmPacketProvider.awaitRunning();
        }
        if(tmProcessor!=null) {
            tmProcessor.awaitRunning();
        }
        
        notifyStarted();
        propagateProcessorStateChange();        
    }

    private void startIfNecessary(Service service) {
File
YProcessor.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation