Index: modules/jpda/src/main/native/jdwp/common/agent/core/AgentEventRequest.cpp =================================================================== --- modules/jpda/src/main/native/jdwp/common/agent/core/AgentEventRequest.cpp (revision 578140) +++ modules/jpda/src/main/native/jdwp/common/agent/core/AgentEventRequest.cpp (working copy) @@ -317,17 +317,16 @@ } } else { // currentCount == m_frameCount // check against line - if (m_size == JDWP_STEP_LINE && currentLine == m_lineNumber) { + if (m_size == JDWP_STEP_LINE && currentLine == m_lineNumber && currentLine != -1) { return false; } } - if (m_size == JDWP_STEP_LINE && currentLine == -1) { - return false; + if (!(m_size == JDWP_STEP_LINE && currentLine == -1)) { + m_lineNumber = currentLine; } m_frameCount = currentCount; - m_lineNumber = currentLine; JDWP_TRACE_EVENT("step: frame=" << m_frameCount << ", line=" << m_lineNumber); return AgentEventRequest::ApplyModifiers(jni, eInfo);