You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/03/26 16:49:17 UTC
svn commit: r758700 - in /camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
components/camel-xmpp/src/test/resources/
Author: davsclaus
Date: Thu Mar 26 15:49:02 2009
New Revision: 758700
URL: http://svn.apache.org/viewvc?rev=758700&view=rev
Log:
Merged revisions 758692 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r758692 | davsclaus | 2009-03-26 16:40:52 +0100 (Thu, 26 Mar 2009) | 1 line
CAMEL-1424: Fixed NPE with BeanInfo.
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/ (props changed)
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 26 15:49:02 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,757636,757693,757743,757865,758539,758563,758600,758617
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,757636,757693,757743,757865,758539,758563,758600,758617,758692
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=758700&r1=758699&r2=758700&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java (original)
+++ camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java Thu Mar 26 15:49:02 2009
@@ -109,8 +109,11 @@
String name = exchange.getIn().getHeader(BeanProcessor.METHOD_NAME, String.class);
if (name != null) {
- if (operations.get(name).size() == 1) {
- methodInfo = operations.get(name).get(0);
+ if (operations.containsKey(name)) {
+ List<MethodInfo> methods = operations.get(name);
+ if (methods != null && methods.size() == 1) {
+ methodInfo = methods.get(0);
+ }
}
}
if (methodInfo == null) {
Propchange: camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 26 15:49:02 2009
@@ -1 +1 @@
-/camel/trunk/components/camel-xmpp/src/test/resources:757693,757743,757865,758539,758563,758617
+/camel/trunk/components/camel-xmpp/src/test/resources:757693,757743,757865,758539,758563,758617,758692