[jbehave-scm] [scm-core/jbehave-4.x][3/11] JBEHAVE-1002: Fixed merging issues.

[Mauro Talevi]

commit f7fa7b40a22c6e54013ae1153f9101f133369dc9
Author:     Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Sun, 13 Apr 2014 12:09:32 +0200
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Sun, 13 Apr 2014 12:09:32 +0200

    JBEHAVE-1002:  Fixed merging issues.

diff --git 
a/jbehave-core/src/main/java/org/jbehave/core/configuration/Configuration.java 
b/jbehave-core/src/main/java/org/jbehave/core/configuration/Configuration.java
index 16e8def..9684cf2 100755
--- 
a/jbehave-core/src/main/java/org/jbehave/core/configuration/Configuration.java
+++ 
b/jbehave-core/src/main/java/org/jbehave/core/configuration/Configuration.java
@@ -193,7 +193,7 @@ public abstract class Configuration {
 
     public StoryParser storyParser() {
                if (storyParser == null) {
-                       storyParser = new RegexStoryParser(this);
+                       storyParser = new RegexStoryParser();
                }
                return storyParser;
        }
@@ -251,7 +251,7 @@ public abstract class Configuration {
     }
 
     public StoryReporter storyReporter(String storyPath) {
-        return storyReporterBuilder.build(storyPath);
+        return storyReporterBuilder().build(storyPath);
     }
 
     public StoryReporterBuilder storyReporterBuilder() {