From 5df6e484c061103de17fb80882cfbcd06ebbe91c Mon Sep 17 00:00:00 2001
From: Hongze Zhang <hongze.zhang@intel.com>
Date: Tue, 9 Nov 2021 11:10:46 +0800
Subject: [PATCH] fixup

---
 .../arrow/dataset/jni/NativeScanner.java      |  6 ++---
 java/pom.xml                                  | 26 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanner.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanner.java
index 56029b593617d..8745dd7cba034 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanner.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanner.java
@@ -128,10 +128,10 @@ public Schema schema() {
       return schema;
     }
     readLock.lock();
-    if (schema != null) {
-      return schema;
-    }
     try {
+      if (schema != null) {
+        return schema;
+      }
       if (closed) {
         throw new NativeInstanceReleasedException();
       }
diff --git a/java/pom.xml b/java/pom.xml
index 1d93eb6577737..38a138ca1a79a 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -716,19 +716,19 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <compilerArgs combine.children="append">
-                <arg>-XDcompilePolicy=simple</arg>
-                <arg>-Xplugin:ErrorProne</arg>
-              </compilerArgs>
-              <annotationProcessorPaths combine.children="append">
-                <path>
-                  <groupId>com.google.errorprone</groupId>
-                  <artifactId>error_prone_core</artifactId>
-                  <version>2.4.0</version>
-                </path>
-              </annotationProcessorPaths>
-            </configuration>
+<!--            <configuration>-->
+<!--              <compilerArgs combine.children="append">-->
+<!--                <arg>-XDcompilePolicy=simple</arg>-->
+<!--                <arg>-Xplugin:ErrorProne</arg>-->
+<!--              </compilerArgs>-->
+<!--              <annotationProcessorPaths combine.children="append">-->
+<!--                <path>-->
+<!--                  <groupId>com.google.errorprone</groupId>-->
+<!--                  <artifactId>error_prone_core</artifactId>-->
+<!--                  <version>2.4.0</version>-->
+<!--                </path>-->
+<!--              </annotationProcessorPaths>-->
+<!--            </configuration>-->
           </plugin>
         </plugins>
       </build>