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 2010/03/21 11:14:14 UTC
svn commit: r925748 - in /camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/util/
camel-core/src/test/java/org/apache/camel/util/
camel-core/src/test/java/org/apache/camel/util/jndi/
Author: davsclaus
Date: Sun Mar 21 10:14:14 2010
New Revision: 925748
URL: http://svn.apache.org/viewvc?rev=925748&view=rev
Log:
Merged revisions 925739 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r925739 | davsclaus | 2010-03-21 09:16:56 +0100 (Sun, 21 Mar 2010) | 1 line
CAMEL-2561: Fixed Camel bean introspection to use English locale to avoid issues with foregin languages in upper casing letters. Thanks to Christian Mueller for patch.
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/jndi/ExampleBean.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 21 10:14:14 2010
@@ -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,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876,887196,895119,896772,898201,901634,902688,903638,903970,904365,904440,904442,905171,905241,905585,905883,906013,906068,906342,908925,909028,916096,924119
+/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,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876,887196,895119,896772,898201,901634,902688,903638,903970,904365,904440,904442,905171,905241,905585,905883,906013,906068,906342,908925,909028,916096,924119,925739
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/util/IntrospectionSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java?rev=925748&r1=925747&r2=925748&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java (original)
+++ camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java Sun Mar 21 10:14:14 2010
@@ -29,6 +29,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -99,7 +100,7 @@ public final class IntrospectionSupport
if (prop == null) {
throw new IllegalArgumentException("prop was null.");
}
- prop = prop.substring(0, 1).toUpperCase() + prop.substring(1);
+ prop = prop.substring(0, 1).toUpperCase(Locale.ENGLISH) + prop.substring(1);
Class clazz = target.getClass();
Method method = getPropertyGetter(clazz, prop);
Modified: camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java?rev=925748&r1=925747&r2=925748&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java (original)
+++ camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java Sun Mar 21 10:14:14 2010
@@ -16,6 +16,8 @@
*/
package org.apache.camel.util;
+import java.util.Locale;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.util.jndi.ExampleBean;
@@ -46,6 +48,29 @@ public class IntrospectionSupportTest ex
assertEquals("Willem", overloadedBean.getName());
}
+ public void testGetPropertyLocaleIndependend() throws Exception {
+ Locale oldLocale = Locale.getDefault();
+ Locale.setDefault(new Locale("tr", "TR"));
+
+ try {
+ ExampleBean bean = new ExampleBean();
+ bean.setName("Claus");
+ bean.setPrice(10.0);
+ bean.setId("1");
+
+ Object name = IntrospectionSupport.getProperty(bean, "name");
+ Object id = IntrospectionSupport.getProperty(bean, "id");
+ Object price = IntrospectionSupport.getProperty(bean, "price");
+
+ assertEquals("Claus", name);
+ assertEquals(10.0, price);
+ assertEquals("1", id);
+ } finally {
+ Locale.setDefault(oldLocale);
+ }
+ }
+
+
public class MyOverloadedBean {
private ExampleBean bean;
Modified: camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/jndi/ExampleBean.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/jndi/ExampleBean.java?rev=925748&r1=925747&r2=925748&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/jndi/ExampleBean.java (original)
+++ camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/jndi/ExampleBean.java Sun Mar 21 10:14:14 2010
@@ -20,11 +20,12 @@ package org.apache.camel.util.jndi;
* @version $Revision$
*/
public class ExampleBean {
+ private String id;
private String name;
private double price;
public String toString() {
- return "ExampleBean[name: " + name + " price: " + price + "]";
+ return "ExampleBean[name: " + name + " price: " + price + " id: " + id + "]";
}
public String getName() {
@@ -42,4 +43,12 @@ public class ExampleBean {
public void setPrice(double price) {
this.price = price;
}
-}
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+}
\ No newline at end of file