Author: ningjiang Date: Wed Dec 28 08:24:14 2011 New Revision: 1225142 URL: http://svn.apache.org/viewvc?rev=1225142&view=rev Log: Merged revisions 1225137 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
................ r1225137 | ningjiang | 2011-12-28 15:50:16 +0800 (Wed, 28 Dec 2011) | 9 lines Merged revisions 1225077 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1225077 | ningjiang | 2011-12-28 11:04:12 +0800 (Wed, 28 Dec 2011) | 1 line CAMEL-4834 camel properties component should support not specifying the file location ........ ................ Added: camel/branches/camel-2.7.x/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityFileLetterWithPropertyTest.java - copied unchanged from r1225137, camel/branches/camel-2.8.x/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityFileLetterWithPropertyTest.java Modified: camel/branches/camel-2.7.x/ (props changed) camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 28 08:24:14 2011 @@ -1,2 +1,2 @@ -/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366,1211774,1211814,1213201,1213531,1214058,1214648,1220717,1221574,1222020,1222077,1224676 -/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363,1211773,1211811,1213197,1213219,1213526,1214639,1220711,1221566,1222006,1222066,1224674 +/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366,1211774,1211814,1213201,1213531,1214058,1214648,1220717,1221574,1222020,1222077,1224676,1225137 +/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363,1211773,1211811,1213197,1213219,1213526,1214639,1220711,1221566,1222006,1222066,1224674,1225077 Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java?rev=1225142&r1=1225141&r2=1225142&view=diff ============================================================================== --- camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java (original) +++ camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java Wed Dec 28 08:24:14 2011 @@ -84,18 +84,19 @@ public class PropertiesComponent extends } public String parseUri(String uri, String... paths) throws Exception { - ObjectHelper.notNull(paths, "paths"); - // location may contain JVM system property or OS environment variables - // so we need to parse those - String[] locations = parseLocations(paths); - - // check cache first - Properties prop = cache ? cacheMap.get(locations) : null; - if (prop == null) { - prop = propertiesResolver.resolveProperties(getCamelContext(), locations); - if (cache) { - cacheMap.put(locations, prop); + Properties prop = null; + if (paths != null) { + // location may contain JVM system property or OS environment variables + // so we need to parse those + String[] locations = parseLocations(paths); + + prop = cache ? cacheMap.get(locations) : null; + if (prop == null) { + prop = propertiesResolver.resolveProperties(getCamelContext(), locations); + if (cache) { + cacheMap.put(locations, prop); + } } }
