aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorShixiong Zhu <shixiong@databricks.com>2015-12-28 15:01:51 -0800
committerShixiong Zhu <shixiong@databricks.com>2015-12-28 15:01:51 -0800
commit710b41172958a0b3a2b70c48821aefc81893731b (patch)
treed09bedea3873c481883574c4abea6baf1ed1e845 /launcher
parentfb572c6e4b0645c8084aa013d0c93bb21a79977b (diff)
downloadspark-710b41172958a0b3a2b70c48821aefc81893731b.tar.gz
spark-710b41172958a0b3a2b70c48821aefc81893731b.tar.bz2
spark-710b41172958a0b3a2b70c48821aefc81893731b.zip
[SPARK-12489][CORE][SQL][MLIB] Fix minor issues found by FindBugs
Include the following changes: 1. Close `java.sql.Statement` 2. Fix incorrect `asInstanceOf`. 3. Remove unnecessary `synchronized` and `ReentrantLock`. Author: Shixiong Zhu <shixiong@databricks.com> Closes #10440 from zsxwing/findbugs.
Diffstat (limited to 'launcher')
-rw-r--r--launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java4
-rw-r--r--launcher/src/main/java/org/apache/spark/launcher/Main.java2
2 files changed, 2 insertions, 4 deletions
diff --git a/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java b/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java
index d099ee9aa9..414ffc2c84 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java
@@ -293,9 +293,7 @@ class LauncherServer implements Closeable {
protected void handle(Message msg) throws IOException {
try {
if (msg instanceof Hello) {
- synchronized (timeout) {
- timeout.cancel();
- }
+ timeout.cancel();
timeout = null;
Hello hello = (Hello) msg;
ChildProcAppHandle handle = pending.remove(hello.secret);
diff --git a/launcher/src/main/java/org/apache/spark/launcher/Main.java b/launcher/src/main/java/org/apache/spark/launcher/Main.java
index a4e3acc674..e751e948e3 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/Main.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/Main.java
@@ -151,7 +151,7 @@ class Main {
@Override
protected boolean handle(String opt, String value) {
- if (opt == CLASS) {
+ if (CLASS.equals(opt)) {
className = value;
}
return false;