Add null check to avoid NPE (apache#28429)

bpzhang · Sep 13, 2023 · 5845e11 · 5845e11
1 parent 51b3b25
commit 5845e11
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.../shardingsphere/infra/binder/context/segment/select/projection/impl/ColumnProjection.java b/.../shardingsphere/infra/binder/context/segment/select/projection/impl/ColumnProjection.java
@@ -94,18 +94,18 @@ public Optional<IdentifierValue> getOwner() {
      * @return original table
      */
     public IdentifierValue getOriginalTable() {
-        if (Strings.isNullOrEmpty(originalTable.getValue())) {
+        if (null == originalTable || Strings.isNullOrEmpty(originalTable.getValue())) {
             return null == owner ? new IdentifierValue("") : owner;
         }
         return originalTable;
     }
 
     /**
      * Get original column.
-     * 
+     *
      * @return original column
      */
     public IdentifierValue getOriginalColumn() {
-        return Strings.isNullOrEmpty(originalColumn.getValue()) ? name : originalColumn;
+        return null == originalColumn || Strings.isNullOrEmpty(originalColumn.getValue()) ? name : originalColumn;
     }
 }