[camel] branch master updated: Camel-core-engine: Fixed CS

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 8bf7811  Camel-core-engine: Fixed CS
8bf7811 is described below

commit 8bf781197c7138be5f8293e149a4a46a612cc40c
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Mar 13 16:59:45 2020 +0100

    Camel-core-engine: Fixed CS
---
 .../java/org/apache/camel/impl/lw/ImmutableCamelContext.java | 12 ++++++------
 .../apache/camel/impl/lw/RuntimeImmutableCamelContext.java   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/ImmutableCamelContext.java
 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/ImmutableCamelContext.java
index a147442..14313aa 100644
--- 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/ImmutableCamelContext.java
+++ 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/ImmutableCamelContext.java
@@ -128,6 +128,10 @@ public class ImmutableCamelContext implements 
ExtendedCamelContext, CatalogCamel
 
     protected volatile CamelContext delegate;
 
+    protected ImmutableCamelContext(CamelContext delegate) {
+        this.delegate = delegate;
+    }
+
     /**
      * Creates the {@link ModelCamelContext} using
      * {@link org.apache.camel.support.DefaultRegistry} as registry.
@@ -143,10 +147,6 @@ public class ImmutableCamelContext implements 
ExtendedCamelContext, CatalogCamel
         };
     }
 
-    public CamelContext getCamelContextReference() {
-        return this;
-    }
-
     /**
      * Creates the {@link CamelContext} using the given {@link BeanRepository}
      * as first-choice repository, and the
@@ -169,8 +169,8 @@ public class ImmutableCamelContext implements 
ExtendedCamelContext, CatalogCamel
         setRegistry(registry);
     }
 
-    protected ImmutableCamelContext(CamelContext delegate) {
-        this.delegate = delegate;
+    public CamelContext getCamelContextReference() {
+        return this;
     }
 
     @Override
diff --git 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/RuntimeImmutableCamelContext.java
 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/RuntimeImmutableCamelContext.java
index fbabf55..d2920b6 100644
--- 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/RuntimeImmutableCamelContext.java
+++ 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/RuntimeImmutableCamelContext.java
@@ -1346,7 +1346,7 @@ public class RuntimeImmutableCamelContext implements 
ExtendedCamelContext, Catal
     public String getEipParameterJsonSchema(String eipName) throws IOException 
{
         // the eip json schema may be in some of the sub-packages so look until
         // we find it
-        String[] subPackages = new String[] { "", "/config", "/dataformat", 
"/language", "/loadbalancer", "/rest" };
+        String[] subPackages = new String[] {"", "/config", "/dataformat", 
"/language", "/loadbalancer", "/rest" };
         for (String sub : subPackages) {
             String path = CamelContextHelper.MODEL_DOCUMENTATION_PREFIX + sub 
+ "/" + eipName + ".json";
             InputStream inputStream = 
getClassResolver().loadResourceAsStream(path);