You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/03/27 15:54:42 UTC
[1/3] camel git commit: CAMEL-8548 Upgraded commons-codec version to
1.10
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x d51c60071 -> 2b975957f
refs/heads/camel-2.15.x 900001d0b -> 4bd6ecdf0
CAMEL-8548 Upgraded commons-codec version to 1.10
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4308fbea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4308fbea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4308fbea
Branch: refs/heads/camel-2.15.x
Commit: 4308fbeaa901913407a78b845a46df72ac290ff4
Parents: 900001d
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Mar 27 11:24:32 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Mar 27 22:53:30 2015 +0800
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4308fbea/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0ec77cc..fca045b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -94,7 +94,7 @@
<cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
<cometd-java-server>2.3.1</cometd-java-server>
<commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
- <commons-codec-version>1.9</commons-codec-version>
+ <commons-codec-version>1.10</commons-codec-version>
<commons-collections-version>3.2.1</commons-collections-version>
<commons-compress-version>1.5</commons-compress-version>
<commons-configuration-version>1.9</commons-configuration-version>
[3/3] camel git commit: CAMEL-8546 Polished the code to avoid NPE
when camel-script have some trouble to load the script engine
Posted by ni...@apache.org.
CAMEL-8546 Polished the code to avoid NPE when camel-script have some trouble to load the script engine
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2b975957
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2b975957
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2b975957
Branch: refs/heads/camel-2.14.x
Commit: 2b975957fe4fc2699bdf92e1972eac45ccce46f1
Parents: d51c600
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Mar 27 17:13:52 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Mar 27 22:54:22 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/script/osgi/Activator.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2b975957/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java b/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
index 4ffb37d..0db41a4 100644
--- a/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
+++ b/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
@@ -90,7 +90,10 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer, Serv
service.register();
}
resolvers.put(bundle.getBundleId(), r);
- updateAvailableScriptLanguages();
+ // Only update the script language engine when the resolver is changed
+ if (r.size() > 0) {
+ updateAvailableScriptLanguages();
+ }
return bundle;
}
@@ -208,7 +211,13 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer, Serv
}
private List<String> getScriptNames(ScriptEngineFactory factory) {
- List<String> names = factory.getNames();
+ List<String> names = null;
+ if (factory != null) {
+ names = factory.getNames();
+ } else {
+ // return an empty script name list
+ names = new ArrayList<String>(0);
+ }
return names;
}
@@ -223,7 +232,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer, Serv
}
return (ScriptEngineFactory) cls.newInstance();
} catch (Exception e) {
- //do something
+ LOG.warn("Cannot create the ScriptEngineFactory: " + e.getClass().getName(), e);
return null;
}
}
[2/3] camel git commit: CAMEL-8546 Polished the code to avoid NPE
when camel-script have some trouble to load the script engine
Posted by ni...@apache.org.
CAMEL-8546 Polished the code to avoid NPE when camel-script have some trouble to load the script engine
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4bd6ecdf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4bd6ecdf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4bd6ecdf
Branch: refs/heads/camel-2.15.x
Commit: 4bd6ecdf0dd81898c62f2e20cc32aadcd1f027ef
Parents: 4308fbe
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Mar 27 17:13:52 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Mar 27 22:53:42 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/script/osgi/Activator.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4bd6ecdf/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java b/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
index 4ffb37d..0db41a4 100644
--- a/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
+++ b/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
@@ -90,7 +90,10 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer, Serv
service.register();
}
resolvers.put(bundle.getBundleId(), r);
- updateAvailableScriptLanguages();
+ // Only update the script language engine when the resolver is changed
+ if (r.size() > 0) {
+ updateAvailableScriptLanguages();
+ }
return bundle;
}
@@ -208,7 +211,13 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer, Serv
}
private List<String> getScriptNames(ScriptEngineFactory factory) {
- List<String> names = factory.getNames();
+ List<String> names = null;
+ if (factory != null) {
+ names = factory.getNames();
+ } else {
+ // return an empty script name list
+ names = new ArrayList<String>(0);
+ }
return names;
}
@@ -223,7 +232,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer, Serv
}
return (ScriptEngineFactory) cls.newInstance();
} catch (Exception e) {
- //do something
+ LOG.warn("Cannot create the ScriptEngineFactory: " + e.getClass().getName(), e);
return null;
}
}