You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by hu...@apache.org on 2019/02/26 03:48:19 UTC
[incubator-dubbo] branch master updated: Fix npe when package is
null. (#3557)
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 5434ab7 Fix npe when package is null. (#3557)
5434ab7 is described below
commit 5434ab74c724e4ed0f4b7dab11e6758a0a9c48d8
Author: Geng Zhang <zh...@antfin.com>
AuthorDate: Tue Feb 26 11:48:02 2019 +0800
Fix npe when package is null. (#3557)
---
.../main/java/org/apache/dubbo/common/Version.java | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java
index 6872e24..0ab48a6 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java
@@ -144,14 +144,18 @@ public final class Version {
public static String getVersion(Class<?> cls, String defaultVersion) {
try {
// find version info from MANIFEST.MF first
- String version = cls.getPackage().getImplementationVersion();
- if (!StringUtils.isEmpty(version)) {
- return version;
- }
-
- version = cls.getPackage().getSpecificationVersion();
- if (!StringUtils.isEmpty(version)) {
- return version;
+ Package pkg = cls.getPackage();
+ String version = null;
+ if (pkg != null) {
+ version = pkg.getImplementationVersion();
+ if (!StringUtils.isEmpty(version)) {
+ return version;
+ }
+
+ version = pkg.getSpecificationVersion();
+ if (!StringUtils.isEmpty(version)) {
+ return version;
+ }
}
// guess version fro jar file name if nothing's found from MANIFEST.MF