[jbehave-scm] [scm-core/jbehave-4.x][10/12] JBEHAVE-911: Added reporting of scenario end when story cancelled.

[Mauro Talevi]

commit bfc5a1a2559dd46e2a2ce3c1c67893791182cd0d
Author:     Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Sun, 23 Jun 2013 18:37:55 +0200
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Sun, 21 Jul 2013 18:49:44 +0200

    JBEHAVE-911:  Added reporting of scenario end when story cancelled.
    
    Conflicts:
        
jbehave-core/src/test/java/org/jbehave/core/embedder/ConcurrencyBehaviour.java

diff --git 
a/jbehave-core/src/main/java/org/jbehave/core/embedder/StoryRunner.java 
b/jbehave-core/src/main/java/org/jbehave/core/embedder/StoryRunner.java
index 04c9f1b..83c3693 100755
--- a/jbehave-core/src/main/java/org/jbehave/core/embedder/StoryRunner.java
+++ b/jbehave-core/src/main/java/org/jbehave/core/embedder/StoryRunner.java
@@ -221,6 +221,7 @@ public class StoryRunner {
         } catch (Throwable e) {
             if (cancelledStories.containsKey(story)) {
                 reporter.get().storyCancelled(story, 
cancelledStories.get(story));
+                reporter.get().afterScenario();
                 reporter.get().afterStory(context.givenStory);
             }
             throw e;
diff --git 
a/jbehave-core/src/main/java/org/jbehave/core/reporters/PrintStreamOutput.java 
b/jbehave-core/src/main/java/org/jbehave/core/reporters/PrintStreamOutput.java
index d620474..43b6bb1 100755
--- 
a/jbehave-core/src/main/java/org/jbehave/core/reporters/PrintStreamOutput.java
+++ 
b/jbehave-core/src/main/java/org/jbehave/core/reporters/PrintStreamOutput.java
@@ -275,7 +275,7 @@ public abstract class PrintStreamOutput implements 
StoryReporter {
     }
 
     public void afterScenario() {
-        if (cause.get() != null && reportFailureTrace.get() && !(cause.get() 
instanceof KnownFailure)) {
+        if (cause.get() != null && !(cause.get() instanceof KnownFailure) && 
reportFailureTrace() ) {
             print(format("afterScenarioWithFailure", "\n{0}\n",
                     new 
StackTraceFormatter(compressFailureTrace()).stackTrace(cause.get())));
         } else {
@@ -411,7 +411,11 @@ public abstract class PrintStreamOutput implements 
StoryReporter {
     }
 
     public boolean reportFailureTrace() {
-        return reportFailureTrace.get();
+        Boolean reportFailure = reportFailureTrace.get();
+        if ( reportFailure != null ){
+            return reportFailure;
+        }
+        return false;
     }
 
     public PrintStreamOutput doReportFailureTrace(boolean reportFailureTrace) {