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 2009/04/23 09:28:56 UTC
svn commit: r767829 - in /camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/util/PackageHelper.java
Author: ningjiang
Date: Thu Apr 23 07:28:55 2009
New Revision: 767829
URL: http://svn.apache.org/viewvc?rev=767829&view=rev
Log:
Merged revisions 767824 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r767824 | ningjiang | 2009-04-23 15:10:37 +0800 (Thu, 23 Apr 2009) | 1 line
CAMEL-1529 Fixed the NPE issue
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 23 07:28:55 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,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
+/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
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/PackageHelper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java?rev=767829&r1=767828&r2=767829&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java (original)
+++ camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java Thu Apr 23 07:28:55 2009
@@ -44,23 +44,25 @@
public static boolean isValidVersion(String packageName, double minimumVersion) {
try {
Package spring = Package.getPackage(packageName);
- String value = spring.getImplementationVersion();
- if (value != null) {
- // lets remove any extra dots in the string...
- int idx = value.indexOf('.');
- if (idx >= 0) {
- StringBuffer buffer = new StringBuffer(value.substring(0, ++idx));
- int i = idx;
- for (int size = value.length(); i < size; i++) {
- char ch = value.charAt(i);
- if (Character.isDigit(ch)) {
- buffer.append(ch);
+ if (spring != null) {
+ String value = spring.getImplementationVersion();
+ if (value != null) {
+ // lets remove any extra dots in the string...
+ int idx = value.indexOf('.');
+ if (idx >= 0) {
+ StringBuffer buffer = new StringBuffer(value.substring(0, ++idx));
+ int i = idx;
+ for (int size = value.length(); i < size; i++) {
+ char ch = value.charAt(i);
+ if (Character.isDigit(ch)) {
+ buffer.append(ch);
+ }
}
+ value = buffer.toString();
}
- value = buffer.toString();
+ double number = Double.parseDouble(value);
+ return number >= minimumVersion;
}
- double number = Double.parseDouble(value);
- return number >= minimumVersion;
}
} catch (Exception e) {
LOG.debug("Failed to find out " + packageName + " version: " + e, e);