You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2008/12/02 01:57:27 UTC
svn commit: r722318 - in /activemq/camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
Author: janstey
Date: Mon Dec 1 16:57:26 2008
New Revision: 722318
URL: http://svn.apache.org/viewvc?rev=722318&view=rev
Log:
Merged revisions 722317 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r722317 | janstey | 2008-12-01 21:15:25 -0330 (Mon, 01 Dec 2008) | 1 line
Get Camel version showing properly
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java?rev=722318&r1=722317&r2=722318&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java Mon Dec 1 16:57:26 2008
@@ -21,6 +21,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.camel.Service;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
/**
@@ -136,11 +137,11 @@
}
protected synchronized String getVersion() {
- if (version != null) {
+ if (ObjectHelper.isNotNullAndNonEmpty(version)) {
return version;
}
- Package aPackage = Package.getPackage("org.apache.camel");
+ Package aPackage = getClass().getPackage();
if (aPackage != null) {
version = aPackage.getImplementationVersion();
if (version == null) {