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:10:38 UTC
svn commit: r767824 -
/camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java
Author: ningjiang
Date: Thu Apr 23 07:10:37 2009
New Revision: 767824
URL: http://svn.apache.org/viewvc?rev=767824&view=rev
Log:
CAMEL-1529 Fixed the NPE issue
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java?rev=767824&r1=767823&r2=767824&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java Thu Apr 23 07:10:37 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);