[jbehave-scm] [scm-core/jbehave-4.x][1/1] JBEHAVE-1036 restore parent givenStory context after running given stories

[Jeremie Huchet]

commit 637f6013952b0ec9359ef6a41937a4f8a908129c
Author:     Jeremie Huchet <jere...@dudie.fr>
AuthorDate: Thu, 23 Apr 2015 20:42:49 +0200
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Sat, 25 Apr 2015 16:07:29 +0200

    JBEHAVE-1036 restore parent givenStory context after running given stories

diff --git 
a/jbehave-core/src/main/java/org/jbehave/core/embedder/PerformableTree.java 
b/jbehave-core/src/main/java/org/jbehave/core/embedder/PerformableTree.java
index 23e4b6f..b56eab7 100644
--- a/jbehave-core/src/main/java/org/jbehave/core/embedder/PerformableTree.java
+++ b/jbehave-core/src/main/java/org/jbehave/core/embedder/PerformableTree.java
@@ -767,10 +767,12 @@ public class PerformableTree {
         private void performGivenStories(RunContext context) throws 
InterruptedException {
             if (givenStories.size() > 0) {
                 context.reporter().givenStories(story.getGivenStories());
+                final boolean parentGivenStory = context.givenStory;
                 for (PerformableStory story : givenStories) {
                     context.givenStory = story.givenStory();
                     story.perform(context);
                 }
+                context.givenStory = parentGivenStory;
            }
         }