From 3823dc13764502cb52fc08427d166626ac25c900 Mon Sep 17 00:00:00 2001 From: yangjiaqi Date: Thu, 8 May 2025 11:11:07 +0800 Subject: [PATCH] fix store node NPE --- .../apache/hugegraph/store/util/Version.java | 18 +++++-- hugegraph-store/hg-store-node/pom.xml | 53 +++++++++++++++++++ 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/util/Version.java b/hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/util/Version.java index a17bd3722a..7653605303 100644 --- a/hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/util/Version.java +++ b/hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/util/Version.java @@ -31,11 +31,21 @@ public class Version { */ public static String getVersion() { if (version.isEmpty()) { - try (InputStream is = Version.class.getResourceAsStream("/version.txt")) { - byte[] buf = new byte[64]; - int len = is.read(buf); - version = new String(buf, 0, len); + try { + InputStream is = Version.class.getResourceAsStream("/version.txt"); + if (is != null) { + try (is) { + byte[] buf = new byte[64]; + int len = is.read(buf); + version = new String(buf, 0, len); + } + } else { + // 如果找不到version.txt文件,设置一个默认值 + version = "unknown"; + log.warn("Cannot find version.txt resource file, using default version: {}", version); + } } catch (Exception e) { + version = "unknown"; log.error("Version.getVersion exception: ", e); } } diff --git a/hugegraph-store/hg-store-node/pom.xml b/hugegraph-store/hg-store-node/pom.xml index 5406b1c8a4..be42afce4b 100644 --- a/hugegraph-store/hg-store-node/pom.xml +++ b/hugegraph-store/hg-store-node/pom.xml @@ -152,6 +152,12 @@ + + + src/main/resources + true + + org.springframework.boot @@ -171,6 +177,53 @@ + + org.apache.maven.plugins + maven-resources-plugin + 3.2.0 + + + generate-version-file + process-resources + + copy-resources + + + ${project.build.outputDirectory} + + + src/main/resources + true + + + src/main/resources-filtered + true + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.0.0 + + + generate-version-txt + generate-resources + + run + + + + + ${project.version} + + + + +