[incubator-hugegraph] branch release-1.0.0 updated: support jdk11 remove config java.ext.dirs (#2070)

[vaughn]

This is an automated email from the ASF dual-hosted git repository.

vaughn pushed a commit to branch release-1.0.0
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git


The following commit(s) were added to refs/heads/release-1.0.0 by this push:
     new d28f8f2d5 support jdk11 remove config java.ext.dirs (#2070)
d28f8f2d5 is described below

commit d28f8f2d5ce2c9aa5fdb4e49c0b384d4291308cd
Author: 青年 <1043706...@qq.com>
AuthorDate: Wed Jan 4 23:16:31 2023 +0800

    support jdk11 remove config java.ext.dirs (#2070)
---
 .../src/main/java/org/apache/hugegraph/structure/HugeElement.java     | 3 +++
 hugegraph-dist/src/assembly/static/bin/dump-conf.sh                   | 4 +++-
 hugegraph-dist/src/assembly/static/bin/dump-store.sh                  | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeElement.java 
b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeElement.java
index 5d5cca741..9862fb8d1 100644
--- 
a/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeElement.java
+++ 
b/hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeElement.java
@@ -436,6 +436,9 @@ public abstract class HugeElement implements Element, 
GraphType, Idfiable {
                 continue;
             }
             if (val == null) {
+                if (key.equals(T.label)) {
+                    throw Element.Exceptions.labelCanNotBeNull();
+                }
                 throw Property.Exceptions.propertyDoesNotExist();
             }
 
diff --git a/hugegraph-dist/src/assembly/static/bin/dump-conf.sh 
b/hugegraph-dist/src/assembly/static/bin/dump-conf.sh
index 9f39a16f2..8b4f5dedd 100755
--- a/hugegraph-dist/src/assembly/static/bin/dump-conf.sh
+++ b/hugegraph-dist/src/assembly/static/bin/dump-conf.sh
@@ -45,5 +45,7 @@ cd $TOP
 
 echo "Dumping HugeGraph Config($conf)..."
 
-exec $JAVA -cp $LIB/hugegraph-dist-*.jar -Djava.ext.dirs=$LIB/ \
+dump_conf_ext_jar_path=$LIB/hugegraph-dist-*.jar
+for i in $LIB/*.jar; do dump_conf_ext_jar_path=$dump_conf_ext_jar_path:$i;  
export dump_conf_ext_jar_path; done
+exec $JAVA -cp dump_conf_ext_jar_path \
 org.apache.hugegraph.cmd.ConfDumper $conf
diff --git a/hugegraph-dist/src/assembly/static/bin/dump-store.sh 
b/hugegraph-dist/src/assembly/static/bin/dump-store.sh
index 428b02025..de3d46b6e 100755
--- a/hugegraph-dist/src/assembly/static/bin/dump-store.sh
+++ b/hugegraph-dist/src/assembly/static/bin/dump-store.sh
@@ -45,5 +45,7 @@ cd $TOP
 
 echo "Dumping HugeGraph Store($conf)..."
 
-exec $JAVA -cp $LIB/hugegraph-dist-*.jar -Djava.ext.dirs=$LIB/ \
+dump_store_ext_jar_path=$LIB/hugegraph-dist-*.jar
+for i in $LIB/*.jar; do dump_store_ext_jar_path=$dump_store_ext_jar_path:$i;  
export dump_store_ext_jar_path; done
+exec $JAVA -cp dump_store_ext_jar_path \
 org.apache.hugegraph.cmd.StoreDumper $conf $2 $3 $4