From 1742752498f6eafbe3abeb24477546a7141f4bd0 Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Mon, 30 Jun 2014 21:22:18 +0200
Subject: [PATCH] fixed all remaining findbugs warnings (even all with
reportLevel low)
---
.../unibz/inf/isochrone/algorithm/Isochrone.java | 2 +-
.../inf/isochrone/config/ConfigIsochrone.java | 16 ++++++----------
.../it/unibz/inf/isochrone/network/Location.java | 2 +-
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/main/java/it/unibz/inf/isochrone/algorithm/Isochrone.java b/src/main/java/it/unibz/inf/isochrone/algorithm/Isochrone.java
index a7876b6d..d66d30b7 100644
--- a/src/main/java/it/unibz/inf/isochrone/algorithm/Isochrone.java
+++ b/src/main/java/it/unibz/inf/isochrone/algorithm/Isochrone.java
@@ -134,7 +134,7 @@ public abstract class Isochrone {
for (final Link link : adjacents) {
if (link.isContinuous()) {
updateQueue(expandContinuousLink(node, link));
- if (new Double(Double.MIN_VALUE).equals(link.getStartOffset())) {
+ if (Double.valueOf(Double.MIN_VALUE).equals(link.getStartOffset())) {
output.addLink(link);
}
} else {
diff --git a/src/main/java/it/unibz/inf/isochrone/config/ConfigIsochrone.java b/src/main/java/it/unibz/inf/isochrone/config/ConfigIsochrone.java
index 7c8b0863..f75dbb65 100644
--- a/src/main/java/it/unibz/inf/isochrone/config/ConfigIsochrone.java
+++ b/src/main/java/it/unibz/inf/isochrone/config/ConfigIsochrone.java
@@ -69,16 +69,12 @@ public final class ConfigIsochrone {
@PropertyValue("org.postgresql.username")
private String user;
- public static ConfigIsochrone getInstance() {
- if (instance == null) { // avoid sync penalty if we can
- synchronized (ConfigIsochrone.class) {
- if (instance == null) { // lock has to be inside of synchronized block
- final ConfigIsochrone config = new ConfigBuilder<>(ConfigIsochrone.class).build();
- config.initConnectionFactory();
-
- instance = config;
- }
- }
+ public static synchronized ConfigIsochrone getInstance() {
+ if (instance == null) {
+ final ConfigIsochrone config = new ConfigBuilder<>(ConfigIsochrone.class).build();
+ config.initConnectionFactory();
+
+ instance = config;
}
return instance;
diff --git a/src/main/java/it/unibz/inf/isochrone/network/Location.java b/src/main/java/it/unibz/inf/isochrone/network/Location.java
index 3c1ef528..a82ad365 100644
--- a/src/main/java/it/unibz/inf/isochrone/network/Location.java
+++ b/src/main/java/it/unibz/inf/isochrone/network/Location.java
@@ -39,7 +39,7 @@ public class Location {
}
final Location other = (Location) obj;
- return other.getLinkId() == getLinkId() && new Double(other.getOffset()).equals(getOffset());
+ return other.getLinkId() == getLinkId() && Double.valueOf(other.getOffset()).equals(getOffset());
}
@Override
--
GitLab